mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-23 10:22:49 +00:00
generic: testing build fix
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
f1a37c1e51
commit
5947aa8294
4 changed files with 19 additions and 17 deletions
|
@ -215,8 +215,7 @@ KFileItemList KFileItemModelBenchmark::createFileItemList(const QStringList& fil
|
||||||
KFileItemList result;
|
KFileItemList result;
|
||||||
foreach (const QString& name, fileNames) {
|
foreach (const QString& name, fileNames) {
|
||||||
const KUrl url(prefix + name);
|
const KUrl url(prefix + name);
|
||||||
const KFileItem item(url, QString(), KFileItem::Unknown);
|
result << KFileItem(url);
|
||||||
result << item;
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -491,7 +491,7 @@ void KFileItemModelTest::testEmptyPath()
|
||||||
const KUrl url("file:///test/");
|
const KUrl url("file:///test/");
|
||||||
|
|
||||||
KFileItemList items;
|
KFileItemList items;
|
||||||
items << KFileItem(emptyUrl, QString(), KFileItem::Unknown) << KFileItem(url, QString(), KFileItem::Unknown);
|
items << KFileItem(emptyUrl) << KFileItem(url);
|
||||||
m_model->slotItemsAdded(items);
|
m_model->slotItemsAdded(items);
|
||||||
m_model->slotCompleted();
|
m_model->slotCompleted();
|
||||||
}
|
}
|
||||||
|
@ -682,16 +682,19 @@ void KFileItemModelTest::testChangeSortRoleWhileFiltering()
|
||||||
entry.insert(KIO::UDSEntry::UDS_ACCESS_TIME, 0);
|
entry.insert(KIO::UDSEntry::UDS_ACCESS_TIME, 0);
|
||||||
|
|
||||||
entry.insert(KIO::UDSEntry::UDS_NAME, "a.txt");
|
entry.insert(KIO::UDSEntry::UDS_NAME, "a.txt");
|
||||||
|
entry.insert(KIO::UDSEntry::UDS_URL, m_testDir->url().url(KUrl::RemoveTrailingSlash) + "/a.txt");
|
||||||
entry.insert(KIO::UDSEntry::UDS_USER, "user-b");
|
entry.insert(KIO::UDSEntry::UDS_USER, "user-b");
|
||||||
items.append(KFileItem(entry, m_testDir->url()));
|
items.append(KFileItem(entry));
|
||||||
|
|
||||||
entry.insert(KIO::UDSEntry::UDS_NAME, "b.txt");
|
entry.insert(KIO::UDSEntry::UDS_NAME, "b.txt");
|
||||||
|
entry.insert(KIO::UDSEntry::UDS_URL, m_testDir->url().url(KUrl::RemoveTrailingSlash) + "/b.txt");
|
||||||
entry.insert(KIO::UDSEntry::UDS_USER, "user-c");
|
entry.insert(KIO::UDSEntry::UDS_USER, "user-c");
|
||||||
items.append(KFileItem(entry, m_testDir->url()));
|
items.append(KFileItem(entry));
|
||||||
|
|
||||||
entry.insert(KIO::UDSEntry::UDS_NAME, "c.txt");
|
entry.insert(KIO::UDSEntry::UDS_NAME, "c.txt");
|
||||||
|
entry.insert(KIO::UDSEntry::UDS_URL, m_testDir->url().url(KUrl::RemoveTrailingSlash) + "/c.txt");
|
||||||
entry.insert(KIO::UDSEntry::UDS_USER, "user-a");
|
entry.insert(KIO::UDSEntry::UDS_USER, "user-a");
|
||||||
items.append(KFileItem(entry, m_testDir->url()));
|
items.append(KFileItem(entry));
|
||||||
|
|
||||||
m_model->slotItemsAdded(items);
|
m_model->slotItemsAdded(items);
|
||||||
m_model->slotCompleted();
|
m_model->slotCompleted();
|
||||||
|
|
|
@ -118,7 +118,7 @@ static void removeDirRecursive( const QString& dir )
|
||||||
// Make it work even with readonly dirs, like trashReadOnlyDirFromHome() creates
|
// Make it work even with readonly dirs, like trashReadOnlyDirFromHome() creates
|
||||||
KUrl u = KUrl::fromPath( dir );
|
KUrl u = KUrl::fromPath( dir );
|
||||||
//kDebug() << "chmod +0200 on" << u;
|
//kDebug() << "chmod +0200 on" << u;
|
||||||
KFileItem fileItem(u, QString::fromLatin1("inode/directory"), KFileItem::Unknown);
|
KFileItem fileItem(u);
|
||||||
KFileItemList fileItemList;
|
KFileItemList fileItemList;
|
||||||
fileItemList.append( fileItem );
|
fileItemList.append( fileItem );
|
||||||
KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, QString(), QString(), true /*recursive*/, KIO::HideProgressInfo );
|
KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, QString(), QString(), true /*recursive*/, KIO::HideProgressInfo );
|
||||||
|
@ -666,7 +666,7 @@ void TestTrash::statRoot()
|
||||||
KIO::UDSEntry entry;
|
KIO::UDSEntry entry;
|
||||||
bool ok = MyNetAccess_stat( url, entry );
|
bool ok = MyNetAccess_stat( url, entry );
|
||||||
QVERIFY( ok );
|
QVERIFY( ok );
|
||||||
KFileItem item( entry, url );
|
KFileItem item( entry );
|
||||||
QVERIFY( item.isDir() );
|
QVERIFY( item.isDir() );
|
||||||
QVERIFY( !item.isLink() );
|
QVERIFY( !item.isLink() );
|
||||||
QVERIFY( item.isReadable() );
|
QVERIFY( item.isReadable() );
|
||||||
|
@ -681,7 +681,7 @@ void TestTrash::statFileInRoot()
|
||||||
KIO::UDSEntry entry;
|
KIO::UDSEntry entry;
|
||||||
bool ok = MyNetAccess_stat( url, entry );
|
bool ok = MyNetAccess_stat( url, entry );
|
||||||
QVERIFY( ok );
|
QVERIFY( ok );
|
||||||
KFileItem item( entry, url );
|
KFileItem item( entry );
|
||||||
QVERIFY( item.isFile() );
|
QVERIFY( item.isFile() );
|
||||||
QVERIFY( !item.isDir() );
|
QVERIFY( !item.isDir() );
|
||||||
QVERIFY( !item.isLink() );
|
QVERIFY( !item.isLink() );
|
||||||
|
@ -697,7 +697,7 @@ void TestTrash::statDirectoryInRoot()
|
||||||
KIO::UDSEntry entry;
|
KIO::UDSEntry entry;
|
||||||
bool ok = MyNetAccess_stat( url, entry );
|
bool ok = MyNetAccess_stat( url, entry );
|
||||||
QVERIFY( ok );
|
QVERIFY( ok );
|
||||||
KFileItem item( entry, url );
|
KFileItem item( entry );
|
||||||
QVERIFY( item.isDir() );
|
QVERIFY( item.isDir() );
|
||||||
QVERIFY( !item.isLink() );
|
QVERIFY( !item.isLink() );
|
||||||
QVERIFY( item.isReadable() );
|
QVERIFY( item.isReadable() );
|
||||||
|
@ -712,7 +712,7 @@ void TestTrash::statSymlinkInRoot()
|
||||||
KIO::UDSEntry entry;
|
KIO::UDSEntry entry;
|
||||||
bool ok = MyNetAccess_stat( url, entry );
|
bool ok = MyNetAccess_stat( url, entry );
|
||||||
QVERIFY( ok );
|
QVERIFY( ok );
|
||||||
KFileItem item( entry, url );
|
KFileItem item( entry );
|
||||||
QVERIFY( item.isLink() );
|
QVERIFY( item.isLink() );
|
||||||
QCOMPARE(item.linkDest(), QString::fromLatin1("/tmp"));
|
QCOMPARE(item.linkDest(), QString::fromLatin1("/tmp"));
|
||||||
QVERIFY( item.isReadable() );
|
QVERIFY( item.isReadable() );
|
||||||
|
@ -727,7 +727,7 @@ void TestTrash::statFileInDirectory()
|
||||||
KIO::UDSEntry entry;
|
KIO::UDSEntry entry;
|
||||||
bool ok = MyNetAccess_stat( url, entry );
|
bool ok = MyNetAccess_stat( url, entry );
|
||||||
QVERIFY( ok );
|
QVERIFY( ok );
|
||||||
KFileItem item( entry, url );
|
KFileItem item( entry );
|
||||||
QVERIFY( item.isFile() );
|
QVERIFY( item.isFile() );
|
||||||
QVERIFY( !item.isLink() );
|
QVERIFY( !item.isLink() );
|
||||||
QVERIFY( item.isReadable() );
|
QVERIFY( item.isReadable() );
|
||||||
|
|
|
@ -80,10 +80,10 @@ void KonqPopupMenuTest::initTestCase()
|
||||||
KSharedConfig::Ptr dolphin = KSharedConfig::openConfig("dolphinrc");
|
KSharedConfig::Ptr dolphin = KSharedConfig::openConfig("dolphinrc");
|
||||||
KConfigGroup(dolphin, "General").writeEntry("ShowCopyMoveMenu", true);
|
KConfigGroup(dolphin, "General").writeEntry("ShowCopyMoveMenu", true);
|
||||||
|
|
||||||
m_thisDirectoryItem = KFileItem(QDir::currentPath(), "inode/directory", S_IFDIR + 0777);
|
m_thisDirectoryItem = KFileItem(QDir::currentPath());
|
||||||
m_fileItem = KFileItem(KUrl(QDir::currentPath() + "/Makefile"), "text/x-makefile", S_IFREG + 0660);
|
m_fileItem = KFileItem(KUrl(QDir::currentPath() + "/Makefile"));
|
||||||
m_linkItem = KFileItem(KUrl("http://www.kde.org/foo"), "text/html", S_IFREG + 0660);
|
m_linkItem = KFileItem(KUrl("http://www.kde.org/foo"));
|
||||||
m_subDirItem = KFileItem(KUrl(QDir::currentPath() + "/CMakeFiles"), "inode/directory", S_IFDIR + 0755);
|
m_subDirItem = KFileItem(KUrl(QDir::currentPath() + "/CMakeFiles"));
|
||||||
m_cut = KStandardAction::cut(0, 0, this);
|
m_cut = KStandardAction::cut(0, 0, this);
|
||||||
m_actionCollection.addAction("cut", m_cut);
|
m_actionCollection.addAction("cut", m_cut);
|
||||||
m_copy = KStandardAction::copy(0, 0, this);
|
m_copy = KStandardAction::copy(0, 0, this);
|
||||||
|
@ -346,7 +346,7 @@ void KonqPopupMenuTest::testViewReadOnlyDirectory()
|
||||||
QSKIP("/root directory is readable", SkipSingle);
|
QSKIP("/root directory is readable", SkipSingle);
|
||||||
}
|
}
|
||||||
|
|
||||||
KFileItem rootItem(notreadabledir, "inode/directory", KFileItem::Unknown);
|
KFileItem rootItem(notreadabledir);
|
||||||
KFileItemList itemList;
|
KFileItemList itemList;
|
||||||
itemList << rootItem;
|
itemList << rootItem;
|
||||||
KUrl viewUrl = rootItem.url();
|
KUrl viewUrl = rootItem.url();
|
||||||
|
|
Loading…
Add table
Reference in a new issue