Differential D15739 Diff 59749 autotests/kfileplacesmodeltest.cpp

Changeset View

Standalone View

View Options

autotests/kfileplacesmodeltest.cpp

Show First 20 Lines • Show All 196 Lines • ▼ Show 20 Line(s)191{
197 QDBusInterface *iface = new QDBusInterface(QDBusConnection::sessionBus().baseService(), udi); 197​ QDBusInterface *iface = new QDBusInterface(QDBusConnection::sessionBus().baseService(), udi);
198 m_interfacesMap[udi] = iface; 198​ m_interfacesMap[udi] = iface;
199 199​
200 return iface; 200​ return iface;
201} 201​}
202 202​
203void KFilePlacesModelTest::testInitialState() 203​void KFilePlacesModelTest::testInitialState()
204{ 204​{
205 QCOMPARE(m_places->rowCount(), 4); // when the xbel file is empty, KFilePlacesModel fills it with 4 default items 205​ QCOMPARE(m_places->rowCount(), 3); // when the xbel file is empty, KFilePlacesModel fills it with 3 default items
206 QCoreApplication::processEvents(); // Devices have a delayed loading 206​ QCoreApplication::processEvents(); // Devices have a delayed loading
207 QCOMPARE(m_places->rowCount(), 9); 207​ QCOMPARE(m_places->rowCount(), 8);
208} 208​}
209 209​
210static const QStringList initialListOfPlaces() 210​static const QStringList initialListOfPlaces()
211{ 211​{
212 return QStringList() << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/"); 212​ return QStringList() << QDir::homePath() << QStringLiteral("trash:/");
213} 213​}
214 214​
215static const QStringList initialListOfShared() 215​static const QStringList initialListOfShared()
216{ 216​{
217 return QStringList() << QStringLiteral("remote:/") << QStringLiteral("/media/nfs"); 217​ return QStringList() << QStringLiteral("remote:/") << QStringLiteral("/media/nfs");
218} 218​}
219 219​
220static const QStringList initialListOfDevices() 220​static const QStringList initialListOfDevices()
Show All 27 Lines245{
248 // add item 248​ // add item
249 249​
250 m_places->addPlace(QStringLiteral("foo"), QUrl::fromLocalFile(QStringLiteral("/foo")), 250​ m_places->addPlace(QStringLiteral("foo"), QUrl::fromLocalFile(QStringLiteral("/foo")),
251 QString(), QString()); 251​ QString(), QString());
252 252​
253 urls = initialListOfUrls(); 253​ urls = initialListOfUrls();
254 254​
255 // it will be added at the end of places section 255​ // it will be added at the end of places section
256 urls.insert(3, QStringLiteral("/foo")); 256​ urls.insert(2, QStringLiteral("/foo"));
257 CHECK_PLACES_URLS(urls); 257​ CHECK_PLACES_URLS(urls);
258 258​
259 // reparse the bookmark file 259​ // reparse the bookmark file
260 260​
261 KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces")); 261​ KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
262 262​
263 bookmarkManager->notifyCompleteChange(QString()); 263​ bookmarkManager->notifyCompleteChange(QString());
264 264​
265 // check if they are the same 265​ // check if they are the same
266 266​
267 CHECK_PLACES_URLS(urls); 267​ CHECK_PLACES_URLS(urls);
268 268​
269 // try to remove item 269​ // try to remove item
270 m_places->removePlace(m_places->index(3, 0)); 270​ m_places->removePlace(m_places->index(2, 0));
271 271​
272 urls = initialListOfUrls(); 272​ urls = initialListOfUrls();
273 CHECK_PLACES_URLS(urls); 273​ CHECK_PLACES_URLS(urls);
274} 274​}
275 275​
276void KFilePlacesModelTest::testInternalBookmarksHaveIds() 276​void KFilePlacesModelTest::testInternalBookmarksHaveIds()
277{ 277​{
278 KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces")); 278​ KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
▲ Show 20 Lines • Show All 103 Lines • ▼ Show 20 Line(s)
382void KFilePlacesModelTest::testMove() 382​void KFilePlacesModelTest::testMove()
383{ 383​{
384 QList<QVariant> args; 384​ QList<QVariant> args;
385 QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int))); 385​ QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int)));
386 QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int))); 386​ QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int)));
387 387​
388 KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces")); 388​ KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
389 KBookmarkGroup root = bookmarkManager->root(); 389​ KBookmarkGroup root = bookmarkManager->root();
390 KBookmark system_root = m_places->bookmarkForIndex(m_places->index(1, 0)); 390​
391 KBookmark before_system_root = m_places->bookmarkForIndex(m_places->index(0, 0)); 391​ KBookmark system_home = m_places->bookmarkForIndex(m_places->index(0, 0));
392 392​
393 // Trying move the root at the end of the list, should move it to the end of places section instead 393​ // Trying move the root at the end of the list, should move it to the end of places section instead
394 // to keep it grouped 394​ // to keep it grouped
395 KBookmark last = root.first(); 395​ KBookmark last = root.first();
396 while (!root.next(last).isNull()) { 396​ while (!root.next(last).isNull()) {
397 last = root.next(last); 397​ last = root.next(last);
398 } 398​ }
399 root.moveBookmark(system_root, last); 399​ root.moveBookmark(system_home, last);
400 bookmarkManager->emitChanged(root); 400​ bookmarkManager->emitChanged(root);
401 401​
402 QStringList urls; 402​ QStringList urls;
403 urls << QDir::homePath() << QStringLiteral("trash:/") << QStringLiteral(KDE_ROOT_PATH) 403​ urls << QStringLiteral("trash:/") << QDir::homePath()
404 << initialListOfShared() 404​ << initialListOfShared()
405 << initialListOfDevices() 405​ << initialListOfDevices()
406 << initialListOfRemovableDevices(); 406​ << initialListOfRemovableDevices();
407 407​
408 CHECK_PLACES_URLS(urls); 408​ CHECK_PLACES_URLS(urls);
409 QCOMPARE(spy_inserted.count(), 1); 409​ QCOMPARE(spy_inserted.count(), 1);
410 args = spy_inserted.takeFirst(); 410​ args = spy_inserted.takeFirst();
411 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 411​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
412 QCOMPARE(args.at(1).toInt(), 2); ​
413 QCOMPARE(args.at(2).toInt(), 2); ​
414 QCOMPARE(spy_removed.count(), 1); ​
415 args = spy_removed.takeFirst(); ​
416 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); ​
417 QCOMPARE(args.at(1).toInt(), 1); 412​ QCOMPARE(args.at(1).toInt(), 1);
418 QCOMPARE(args.at(2).toInt(), 1); 413​ QCOMPARE(args.at(2).toInt(), 1);
419 ​
420 // Move the root at the beginning of the list ​
421 root.moveBookmark(system_root, KBookmark()); ​
422 bookmarkManager->emitChanged(root); ​
423 ​
424 urls.clear(); ​
425 urls << QStringLiteral(KDE_ROOT_PATH) << QDir::homePath() << QStringLiteral("trash:/") ​
426 << initialListOfShared() ​
427 << initialListOfDevices() ​
428 << initialListOfRemovableDevices(); ​
429 ​
430 CHECK_PLACES_URLS(urls); ​
431 QCOMPARE(spy_inserted.count(), 1); ​
432 args = spy_inserted.takeFirst(); ​
433 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); ​
434 QCOMPARE(args.at(1).toInt(), 0); ​
435 QCOMPARE(args.at(2).toInt(), 0); ​
436 QCOMPARE(spy_removed.count(), 1); 414​ QCOMPARE(spy_removed.count(), 1);
437 args = spy_removed.takeFirst(); 415​ args = spy_removed.takeFirst();
438 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 416​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
439 QCOMPARE(args.at(1).toInt(), 3); 417​ QCOMPARE(args.at(1).toInt(), 0);
440 QCOMPARE(args.at(2).toInt(), 3); 418​ QCOMPARE(args.at(2).toInt(), 0);
441 419​
442 // Move the root in the list (at its original place) 420​ // Move home at the beginning of the list (at its original place)
443 root.moveBookmark(system_root, before_system_root); 421​ root.moveBookmark(system_home, KBookmark());
444 bookmarkManager->emitChanged(root); 422​ bookmarkManager->emitChanged(root);
445 urls.clear(); 423​ urls.clear();
446 urls << initialListOfPlaces() 424​ urls << initialListOfPlaces()
447 << initialListOfShared() 425​ << initialListOfShared()
448 << initialListOfDevices() 426​ << initialListOfDevices()
449 << initialListOfRemovableDevices(); 427​ << initialListOfRemovableDevices();
450 CHECK_PLACES_URLS(urls); 428​ CHECK_PLACES_URLS(urls);
451 QCOMPARE(spy_inserted.count(), 1); 429​ QCOMPARE(spy_inserted.count(), 1);
452 args = spy_inserted.takeFirst(); 430​ args = spy_inserted.takeFirst();
453 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 431​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
454 QCOMPARE(args.at(1).toInt(), 1); 432​ QCOMPARE(args.at(1).toInt(), 1);
455 QCOMPARE(args.at(2).toInt(), 1); 433​ QCOMPARE(args.at(2).toInt(), 1);
456 QCOMPARE(spy_removed.count(), 1); 434​ QCOMPARE(spy_removed.count(), 1);
457 args = spy_removed.takeFirst(); 435​ args = spy_removed.takeFirst();
458 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 436​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
459 QCOMPARE(args.at(1).toInt(), 0); 437​ QCOMPARE(args.at(1).toInt(), 0);
460 QCOMPARE(args.at(2).toInt(), 0); 438​ QCOMPARE(args.at(2).toInt(), 0);
461} 439​}
462 440​
441​
463void KFilePlacesModelTest::testDragAndDrop() 442​void KFilePlacesModelTest::testDragAndDrop()
464{ 443​{
465 QList<QVariant> args; 444​ QList<QVariant> args;
466 QSignalSpy spy_moved(m_places, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int))); 445​ QSignalSpy spy_moved(m_places, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)));
467 446​
468 // Monitor rowsInserted() and rowsRemoved() to ensure they are never emitted: 447​ // Monitor rowsInserted() and rowsRemoved() to ensure they are never emitted:
469 // Moving with drag and drop is expected to emit rowsMoved() 448​ // Moving with drag and drop is expected to emit rowsMoved()
470 QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int))); 449​ QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int)));
471 QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int))); 450​ QSignalSpy spy_removed(m_places, SIGNAL(rowsRemoved(QModelIndex,int,int)));
472 451​
473 // Move the KDE_ROOT_PATH at the end of the places list 452​
453​ // Move /home at the end of the places list
474 QModelIndexList indexes; 454​ QModelIndexList indexes;
475 indexes << m_places->index(1, 0); 455​ indexes << m_places->index(0, 0);
476 QMimeData *mimeData = m_places->mimeData(indexes); 456​ QMimeData *mimeData = m_places->mimeData(indexes);
477 QVERIFY(m_places->dropMimeData(mimeData, Qt::MoveAction, 3, 0, QModelIndex())); 457​ QVERIFY(m_places->dropMimeData(mimeData, Qt::MoveAction, 2, 0, QModelIndex()));
478 458​
479 QStringList urls; 459​ QStringList urls;
480 urls << QDir::homePath() << QStringLiteral("trash:/") << QStringLiteral(KDE_ROOT_PATH) 460​ urls << QStringLiteral("trash:/") << QDir::homePath()
481 << initialListOfShared() 461​ << initialListOfShared()
482 << initialListOfDevices() 462​ << initialListOfDevices()
483 << initialListOfRemovableDevices(); 463​ << initialListOfRemovableDevices();
484 CHECK_PLACES_URLS(urls); 464​ CHECK_PLACES_URLS(urls);
485 QCOMPARE(spy_inserted.count(), 0); 465​ QCOMPARE(spy_inserted.count(), 0);
486 QCOMPARE(spy_removed.count(), 0); 466​ QCOMPARE(spy_removed.count(), 0);
487 QCOMPARE(spy_moved.count(), 1); 467​ QCOMPARE(spy_moved.count(), 1);
488 args = spy_moved.takeFirst(); 468​ args = spy_moved.takeFirst();
489 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 469​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
490 QCOMPARE(args.at(1).toInt(), 1); 470​ QCOMPARE(args.at(1).toInt(), 0);
491 QCOMPARE(args.at(2).toInt(), 1); 471​ QCOMPARE(args.at(2).toInt(), 0);
492 QCOMPARE(args.at(3).toModelIndex(), QModelIndex()); 472​ QCOMPARE(args.at(3).toModelIndex(), QModelIndex());
493 QCOMPARE(args.at(4).toInt(), 3); 473​ QCOMPARE(args.at(4).toInt(), 2);
494 474​
495 // Move the KDE_ROOT_PATH at the beginning of the list 475​ // Move home back at the beginning of the list
496 indexes.clear(); 476​ indexes.clear();
497 indexes << m_places->index(2, 0); 477​ indexes << m_places->index(1, 0);
498 mimeData = m_places->mimeData(indexes); 478​ mimeData = m_places->mimeData(indexes);
499 QVERIFY(m_places->dropMimeData(mimeData, Qt::MoveAction, 0, 0, QModelIndex())); 479​ QVERIFY(m_places->dropMimeData(mimeData, Qt::MoveAction, 0, 0, QModelIndex()));
500 480​
501 urls.clear(); 481​ urls.clear();
502 urls << QStringLiteral(KDE_ROOT_PATH) << QDir::homePath() << QStringLiteral("trash:/") 482​ urls << QDir::homePath() << QStringLiteral("trash:/")
503 << initialListOfShared() 483​ << initialListOfShared()
504 << initialListOfDevices() 484​ << initialListOfDevices()
505 << initialListOfRemovableDevices(); 485​ << initialListOfRemovableDevices();
506 CHECK_PLACES_URLS(urls); 486​ CHECK_PLACES_URLS(urls);
507 QCOMPARE(spy_inserted.count(), 0); 487​ QCOMPARE(spy_inserted.count(), 0);
508 QCOMPARE(spy_removed.count(), 0); 488​ QCOMPARE(spy_removed.count(), 0);
509 QCOMPARE(spy_moved.count(), 1); 489​ QCOMPARE(spy_moved.count(), 1);
510 args = spy_moved.takeFirst(); 490​ args = spy_moved.takeFirst();
511 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 491​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
512 QCOMPARE(args.at(1).toInt(), 2); 492​ QCOMPARE(args.at(1).toInt(), 1);
513 QCOMPARE(args.at(2).toInt(), 2); 493​ QCOMPARE(args.at(2).toInt(), 1);
514 QCOMPARE(args.at(3).toModelIndex(), QModelIndex()); 494​ QCOMPARE(args.at(3).toModelIndex(), QModelIndex());
515 QCOMPARE(args.at(4).toInt(), 0); 495​ QCOMPARE(args.at(4).toInt(), 0);
516 496​
517 // Move the KDE_ROOT_PATH in the list (at its original place) ​
518 indexes.clear(); ​
519 indexes << m_places->index(0, 0); ​
520 mimeData = m_places->mimeData(indexes); ​
521 QVERIFY(m_places->dropMimeData(mimeData, Qt::MoveAction, 2, 0, QModelIndex())); ​
522 ​
523 urls.clear(); ​
524 urls << initialListOfPlaces() ​
525 << initialListOfShared() ​
526 << initialListOfDevices() ​
527 << initialListOfRemovableDevices(); ​
528 CHECK_PLACES_URLS(urls); ​
529 QCOMPARE(spy_inserted.count(), 0); ​
530 QCOMPARE(spy_removed.count(), 0); ​
531 QCOMPARE(spy_moved.count(), 1); ​
532 args = spy_moved.takeFirst(); ​
533 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); ​
534 QCOMPARE(args.at(1).toInt(), 0); ​
535 QCOMPARE(args.at(2).toInt(), 0); ​
536 QCOMPARE(args.at(3).toModelIndex(), QModelIndex()); ​
537 QCOMPARE(args.at(4).toInt(), 2); ​
538 ​
539 // Dropping on an item is not allowed 497​ // Dropping on an item is not allowed
540 indexes.clear(); 498​ indexes.clear();
541 indexes << m_places->index(4, 0); 499​ indexes << m_places->index(4, 0);
542 mimeData = m_places->mimeData(indexes); 500​ mimeData = m_places->mimeData(indexes);
543 QVERIFY(!m_places->dropMimeData(mimeData, Qt::MoveAction, -1, 0, m_places->index(2, 0))); 501​ QVERIFY(!m_places->dropMimeData(mimeData, Qt::MoveAction, -1, 0, m_places->index(2, 0)));
544 CHECK_PLACES_URLS(urls); 502​ CHECK_PLACES_URLS(urls);
545 QCOMPARE(spy_inserted.count(), 0); 503​ QCOMPARE(spy_inserted.count(), 0);
546 QCOMPARE(spy_removed.count(), 0); 504​ QCOMPARE(spy_removed.count(), 0);
Show All 13 Lines509{
560 urls << initialListOfPlaces() << QStringLiteral("/home/foo") 518​ urls << initialListOfPlaces() << QStringLiteral("/home/foo")
561 << initialListOfShared() 519​ << initialListOfShared()
562 << initialListOfDevices() 520​ << initialListOfDevices()
563 << initialListOfRemovableDevices(); 521​ << initialListOfRemovableDevices();
564 CHECK_PLACES_URLS(urls); 522​ CHECK_PLACES_URLS(urls);
565 QCOMPARE(spy_inserted.count(), 1); 523​ QCOMPARE(spy_inserted.count(), 1);
566 args = spy_inserted.takeFirst(); 524​ args = spy_inserted.takeFirst();
567 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 525​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
568 QCOMPARE(args.at(1).toInt(), 3); 526​ QCOMPARE(args.at(1).toInt(), 2);
569 QCOMPARE(args.at(2).toInt(), 3); 527​ QCOMPARE(args.at(2).toInt(), 2);
570 QCOMPARE(spy_removed.count(), 0); 528​ QCOMPARE(spy_removed.count(), 0);
571 529​
572 KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces")); 530​ KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
573 KBookmarkGroup root = bookmarkManager->root(); 531​ KBookmarkGroup root = bookmarkManager->root();
574 KBookmark before_trash = m_places->bookmarkForIndex(m_places->index(1, 0)); 532​ KBookmark before_trash = m_places->bookmarkForIndex(m_places->index(0, 0));
575 KBookmark foo = m_places->bookmarkForIndex(m_places->index(3, 0)); 533​ KBookmark foo = m_places->bookmarkForIndex(m_places->index(2, 0));
576 534​
577 root.moveBookmark(foo, before_trash); 535​ root.moveBookmark(foo, before_trash);
578 bookmarkManager->emitChanged(root); 536​ bookmarkManager->emitChanged(root);
579 537​
580 urls.clear(); 538​ urls.clear();
581 urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/home/foo") << QStringLiteral("trash:/") 539​ urls << QDir::homePath() << QStringLiteral("/home/foo") << QStringLiteral("trash:/")
582 << initialListOfShared() 540​ << initialListOfShared()
583 << initialListOfDevices() 541​ << initialListOfDevices()
584 << initialListOfRemovableDevices(); 542​ << initialListOfRemovableDevices();
585 CHECK_PLACES_URLS(urls); 543​ CHECK_PLACES_URLS(urls);
586 QCOMPARE(spy_inserted.count(), 1); 544​ QCOMPARE(spy_inserted.count(), 1);
587 args = spy_inserted.takeFirst(); 545​ args = spy_inserted.takeFirst();
588 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 546​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
589 QCOMPARE(args.at(1).toInt(), 3); 547​ QCOMPARE(args.at(1).toInt(), 2);
590 QCOMPARE(args.at(2).toInt(), 3); 548​ QCOMPARE(args.at(2).toInt(), 2);
591 QCOMPARE(spy_removed.count(), 1); 549​ QCOMPARE(spy_removed.count(), 1);
592 args = spy_removed.takeFirst(); 550​ args = spy_removed.takeFirst();
593 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 551​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
594 QCOMPARE(args.at(1).toInt(), 2); 552​ QCOMPARE(args.at(1).toInt(), 1);
595 QCOMPARE(args.at(2).toInt(), 2); 553​ QCOMPARE(args.at(2).toInt(), 1);
596 554​
597 m_places->editPlace(m_places->index(2, 0), QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/mnt/foo"))); 555​ m_places->editPlace(m_places->index(1, 0), QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/mnt/foo")));
598 556​
599 urls.clear(); 557​ urls.clear();
600 urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/mnt/foo") << QStringLiteral("trash:/") 558​ urls << QDir::homePath() << QStringLiteral("/mnt/foo") << QStringLiteral("trash:/")
601 << initialListOfShared() 559​ << initialListOfShared()
602 << initialListOfDevices() 560​ << initialListOfDevices()
603 << initialListOfRemovableDevices(); 561​ << initialListOfRemovableDevices();
604 CHECK_PLACES_URLS(urls); 562​ CHECK_PLACES_URLS(urls);
605 QCOMPARE(spy_inserted.count(), 0); 563​ QCOMPARE(spy_inserted.count(), 0);
606 QCOMPARE(spy_removed.count(), 0); 564​ QCOMPARE(spy_removed.count(), 0);
607 QCOMPARE(spy_changed.count(), 1); 565​ QCOMPARE(spy_changed.count(), 1);
608 args = spy_changed.takeFirst(); 566​ args = spy_changed.takeFirst();
609 QCOMPARE(args.at(0).toModelIndex(), m_places->index(2, 0)); 567​ QCOMPARE(args.at(0).toModelIndex(), m_places->index(1, 0));
610 QCOMPARE(args.at(1).toModelIndex(), m_places->index(2, 0)); 568​ QCOMPARE(args.at(1).toModelIndex(), m_places->index(1, 0));
611 569​
612 foo = m_places->bookmarkForIndex(m_places->index(2, 0)); 570​ foo = m_places->bookmarkForIndex(m_places->index(1, 0));
613 foo.setFullText(QStringLiteral("Bar")); 571​ foo.setFullText(QStringLiteral("Bar"));
614 bookmarkManager->notifyCompleteChange(QString()); 572​ bookmarkManager->notifyCompleteChange(QString());
615 573​
616 urls.clear(); 574​ urls.clear();
617 urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("/mnt/foo") << QStringLiteral("trash:/") 575​ urls << QDir::homePath() << QStringLiteral("/mnt/foo") << QStringLiteral("trash:/")
618 << initialListOfShared() 576​ << initialListOfShared()
619 << initialListOfDevices() 577​ << initialListOfDevices()
620 << initialListOfRemovableDevices(); 578​ << initialListOfRemovableDevices();
621 579​
622 CHECK_PLACES_URLS(urls); 580​ CHECK_PLACES_URLS(urls);
623 QCOMPARE(spy_inserted.count(), 0); 581​ QCOMPARE(spy_inserted.count(), 0);
624 QCOMPARE(spy_removed.count(), 0); 582​ QCOMPARE(spy_removed.count(), 0);
625 QCOMPARE(spy_changed.count(), 10); 583​ QCOMPARE(spy_changed.count(), 9);
626 args = spy_changed[2]; 584​ args = spy_changed[2];
627 QCOMPARE(args.at(0).toModelIndex(), m_places->index(2, 0)); 585​ QCOMPARE(args.at(0).toModelIndex(), m_places->index(2, 0));
628 QCOMPARE(args.at(1).toModelIndex(), m_places->index(2, 0)); 586​ QCOMPARE(args.at(1).toModelIndex(), m_places->index(2, 0));
629 spy_changed.clear(); 587​ spy_changed.clear();
630 588​
631 m_places->removePlace(m_places->index(2, 0)); 589​ m_places->removePlace(m_places->index(1, 0));
632 590​
633 urls.clear(); 591​ urls.clear();
634 urls << initialListOfPlaces() 592​ urls << initialListOfPlaces()
635 << initialListOfShared() 593​ << initialListOfShared()
636 << initialListOfDevices() 594​ << initialListOfDevices()
637 << initialListOfRemovableDevices(); 595​ << initialListOfRemovableDevices();
638 CHECK_PLACES_URLS(urls); 596​ CHECK_PLACES_URLS(urls);
639 QCOMPARE(spy_inserted.count(), 0); 597​ QCOMPARE(spy_inserted.count(), 0);
640 QCOMPARE(spy_removed.count(), 1); 598​ QCOMPARE(spy_removed.count(), 1);
641 args = spy_removed.takeFirst(); 599​ args = spy_removed.takeFirst();
642 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 600​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
643 QCOMPARE(args.at(1).toInt(), 2); 601​ QCOMPARE(args.at(1).toInt(), 1);
644 QCOMPARE(args.at(2).toInt(), 2); 602​ QCOMPARE(args.at(2).toInt(), 1);
645 603​
646 m_places->addPlace(QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/home/foo")), QString(), QString(), m_places->index(0, 0)); 604​ m_places->addPlace(QStringLiteral("Foo"), QUrl::fromLocalFile(QStringLiteral("/home/foo")), QString(), QString(), m_places->index(0, 0));
647 605​
648 urls.clear(); 606​ urls.clear();
649 urls << QDir::homePath() << QStringLiteral("/home/foo") << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") 607​ urls << QDir::homePath() << QStringLiteral("/home/foo") << QStringLiteral("trash:/")
650 << initialListOfShared() 608​ << initialListOfShared()
651 << initialListOfDevices() 609​ << initialListOfDevices()
652 << initialListOfRemovableDevices(); 610​ << initialListOfRemovableDevices();
653 CHECK_PLACES_URLS(urls); 611​ CHECK_PLACES_URLS(urls);
654 QCOMPARE(spy_inserted.count(), 1); 612​ QCOMPARE(spy_inserted.count(), 1);
655 args = spy_inserted.takeFirst(); 613​ args = spy_inserted.takeFirst();
656 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 614​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
657 QCOMPARE(args.at(1).toInt(), 1); 615​ QCOMPARE(args.at(1).toInt(), 1);
Show All 16 Lines631 urls << initialListOfPlaces()
674 << initialListOfShared() 632​ << initialListOfShared()
675 << initialListOfDevices() 633​ << initialListOfDevices()
676 << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom"); 634​ << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
677 CHECK_PLACES_URLS(urls); 635​ CHECK_PLACES_URLS(urls);
678 QCOMPARE(spy_inserted.count(), 0); 636​ QCOMPARE(spy_inserted.count(), 0);
679 QCOMPARE(spy_removed.count(), 1); 637​ QCOMPARE(spy_removed.count(), 1);
680 args = spy_removed.takeFirst(); 638​ args = spy_removed.takeFirst();
681 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 639​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
682 QCOMPARE(args.at(1).toInt(), 7); 640​ QCOMPARE(args.at(1).toInt(), 6);
683 QCOMPARE(args.at(2).toInt(), 7); 641​ QCOMPARE(args.at(2).toInt(), 6);
684 642​
685 fakeManager()->call(QStringLiteral("plug"), "/org/kde/solid/fakehw/volume_part1_size_993284096"); 643​ fakeManager()->call(QStringLiteral("plug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
686 644​
687 urls.clear(); 645​ urls.clear();
688 urls << initialListOfPlaces() 646​ urls << initialListOfPlaces()
689 << initialListOfShared() 647​ << initialListOfShared()
690 << initialListOfDevices() 648​ << initialListOfDevices()
691 << initialListOfRemovableDevices(); 649​ << initialListOfRemovableDevices();
692 CHECK_PLACES_URLS(urls); 650​ CHECK_PLACES_URLS(urls);
693 QCOMPARE(spy_inserted.count(), 1); 651​ QCOMPARE(spy_inserted.count(), 1);
694 args = spy_inserted.takeFirst(); 652​ args = spy_inserted.takeFirst();
695 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 653​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
696 QCOMPARE(args.at(1).toInt(), 7); 654​ QCOMPARE(args.at(1).toInt(), 6);
697 QCOMPARE(args.at(2).toInt(), 7); 655​ QCOMPARE(args.at(2).toInt(), 6);
698 QCOMPARE(spy_removed.count(), 0); 656​ QCOMPARE(spy_removed.count(), 0);
699 657​
700 // Move the device in the list, and check that it memorizes the position across plug/unplug 658​ // Move the device in the list, and check that it memorizes the position across plug/unplug
701 659​
702 KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces")); 660​ KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile(), QStringLiteral("kfilePlaces"));
703 KBookmarkGroup root = bookmarkManager->root(); 661​ KBookmarkGroup root = bookmarkManager->root();
704 KBookmark before_floppy; 662​ KBookmark before_floppy;
705 663​
706 KBookmark device = root.first(); // The device we'll move is the 7th bookmark 664​ KBookmark device = root.first(); // The device we'll move is the 6th bookmark
707 for (int i = 0; i < 6; i++) { 665​ for (int i = 0; i < 5; i++) {
708 if (i == 3) { 666​ if (i == 2) {
709 // store item before to be able to move it back to original position 667​ // store item before to be able to move it back to original position
710 device = before_floppy = root.next(device); 668​ device = before_floppy = root.next(device);
711 } else { 669​ } else {
712 device = root.next(device); 670​ device = root.next(device);
713 } 671​ }
714 } 672​ }
715 673​
716 root.moveBookmark(device, before_floppy); 674​ root.moveBookmark(device, before_floppy);
717 bookmarkManager->emitChanged(root); 675​ bookmarkManager->emitChanged(root);
718 676​
719 urls.clear(); 677​ urls.clear();
720 urls << initialListOfPlaces() 678​ urls << initialListOfPlaces()
721 << initialListOfShared() 679​ << initialListOfShared()
722 << initialListOfDevices() 680​ << initialListOfDevices()
723 << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom"); 681​ << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
724 CHECK_PLACES_URLS(urls); 682​ CHECK_PLACES_URLS(urls);
725 QCOMPARE(spy_inserted.count(), 1); 683​ QCOMPARE(spy_inserted.count(), 1);
726 args = spy_inserted.takeFirst(); 684​ args = spy_inserted.takeFirst();
727 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 685​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
728 QCOMPARE(args.at(1).toInt(), 7); 686​ QCOMPARE(args.at(1).toInt(), 6);
729 QCOMPARE(args.at(2).toInt(), 7); 687​ QCOMPARE(args.at(2).toInt(), 6);
730 QCOMPARE(spy_removed.count(), 1); 688​ QCOMPARE(spy_removed.count(), 1);
731 args = spy_removed.takeFirst(); 689​ args = spy_removed.takeFirst();
732 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 690​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
733 QCOMPARE(args.at(1).toInt(), 6); 691​ QCOMPARE(args.at(1).toInt(), 5);
734 QCOMPARE(args.at(2).toInt(), 6); 692​ QCOMPARE(args.at(2).toInt(), 5);
735 693​
736 fakeManager()->call(QStringLiteral("unplug"), "/org/kde/solid/fakehw/volume_part1_size_993284096"); 694​ fakeManager()->call(QStringLiteral("unplug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
737 695​
738 urls.clear(); 696​ urls.clear();
739 urls << initialListOfPlaces() 697​ urls << initialListOfPlaces()
740 << initialListOfShared() 698​ << initialListOfShared()
741 << initialListOfDevices() 699​ << initialListOfDevices()
742 << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom"); 700​ << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
743 CHECK_PLACES_URLS(urls); 701​ CHECK_PLACES_URLS(urls);
744 QCOMPARE(spy_inserted.count(), 0); 702​ QCOMPARE(spy_inserted.count(), 0);
745 QCOMPARE(spy_removed.count(), 1); 703​ QCOMPARE(spy_removed.count(), 1);
746 args = spy_removed.takeFirst(); 704​ args = spy_removed.takeFirst();
747 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 705​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
748 QCOMPARE(args.at(1).toInt(), 6); 706​ QCOMPARE(args.at(1).toInt(), 5);
749 QCOMPARE(args.at(2).toInt(), 6); 707​ QCOMPARE(args.at(2).toInt(), 5);
750 708​
751 fakeManager()->call(QStringLiteral("plug"), "/org/kde/solid/fakehw/volume_part1_size_993284096"); 709​ fakeManager()->call(QStringLiteral("plug"), "/org/kde/solid/fakehw/volume_part1_size_993284096");
752 710​
753 urls.clear(); 711​ urls.clear();
754 urls << initialListOfPlaces() 712​ urls << initialListOfPlaces()
755 << initialListOfShared() 713​ << initialListOfShared()
756 << initialListOfDevices() << QStringLiteral("/media/XO-Y4") 714​ << initialListOfDevices() << QStringLiteral("/media/XO-Y4")
757 << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom"); 715​ << QStringLiteral("/media/floppy0") << QStringLiteral("/media/cdrom");
758 CHECK_PLACES_URLS(urls); 716​ CHECK_PLACES_URLS(urls);
759 QCOMPARE(spy_inserted.count(), 1); 717​ QCOMPARE(spy_inserted.count(), 1);
760 args = spy_inserted.takeFirst(); 718​ args = spy_inserted.takeFirst();
761 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 719​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
762 QCOMPARE(args.at(1).toInt(), 6); 720​ QCOMPARE(args.at(1).toInt(), 5);
763 QCOMPARE(args.at(2).toInt(), 6); 721​ QCOMPARE(args.at(2).toInt(), 5);
764 QCOMPARE(spy_removed.count(), 0); 722​ QCOMPARE(spy_removed.count(), 0);
765 723​
766 KBookmark seventh = root.first(); 724​ KBookmark sixth = root.first();
767 for (int i = 0; i < 6; i++) { 725​ for (int i = 0; i < 5; i++) {
768 seventh = root.next(seventh); 726​ sixth = root.next(sixth);
769 } 727​ }
770 root.moveBookmark(device, seventh); 728​ root.moveBookmark(device, sixth);
771 bookmarkManager->emitChanged(root); 729​ bookmarkManager->emitChanged(root);
772 730​
773 urls.clear(); 731​ urls.clear();
774 urls << initialListOfPlaces() 732​ urls << initialListOfPlaces()
775 << initialListOfShared() 733​ << initialListOfShared()
776 << initialListOfDevices() 734​ << initialListOfDevices()
777 << initialListOfRemovableDevices(); 735​ << initialListOfRemovableDevices();
778 CHECK_PLACES_URLS(urls); 736​ CHECK_PLACES_URLS(urls);
779 QCOMPARE(spy_inserted.count(), 1); 737​ QCOMPARE(spy_inserted.count(), 1);
780 args = spy_inserted.takeFirst(); 738​ args = spy_inserted.takeFirst();
781 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 739​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
782 QCOMPARE(args.at(1).toInt(), 7); 740​ QCOMPARE(args.at(1).toInt(), 6);
783 QCOMPARE(args.at(2).toInt(), 7); 741​ QCOMPARE(args.at(2).toInt(), 6);
784 QCOMPARE(spy_removed.count(), 1); 742​ QCOMPARE(spy_removed.count(), 1);
785 args = spy_removed.takeFirst(); 743​ args = spy_removed.takeFirst();
786 QCOMPARE(args.at(0).toModelIndex(), QModelIndex()); 744​ QCOMPARE(args.at(0).toModelIndex(), QModelIndex());
787 QCOMPARE(args.at(1).toInt(), 6); 745​ QCOMPARE(args.at(1).toInt(), 5);
788 QCOMPARE(args.at(2).toInt(), 6); 746​ QCOMPARE(args.at(2).toInt(), 5);
789} 747​}
790 748​
791void KFilePlacesModelTest::testDeviceSetupTeardown() 749​void KFilePlacesModelTest::testDeviceSetupTeardown()
792{ 750​{
793 QList<QVariant> args; 751​ QList<QVariant> args;
794 QSignalSpy spy_changed(m_places, SIGNAL(dataChanged(QModelIndex,QModelIndex))); 752​ QSignalSpy spy_changed(m_places, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
795 753​
796 fakeDevice(QStringLiteral("/org/kde/solid/fakehw/volume_part1_size_993284096/StorageAccess"))->call(QStringLiteral("teardown")); 754​ fakeDevice(QStringLiteral("/org/kde/solid/fakehw/volume_part1_size_993284096/StorageAccess"))->call(QStringLiteral("teardown"));
797 755​
798 QCOMPARE(spy_changed.count(), 1); 756​ QCOMPARE(spy_changed.count(), 1);
799 args = spy_changed.takeFirst(); 757​ args = spy_changed.takeFirst();
800 QCOMPARE(args.at(0).toModelIndex().row(), 7); 758​ QCOMPARE(args.at(0).toModelIndex().row(), 6);
801 QCOMPARE(args.at(1).toModelIndex().row(), 7); 759​ QCOMPARE(args.at(1).toModelIndex().row(), 6);
802 760​
803 fakeDevice(QStringLiteral("/org/kde/solid/fakehw/volume_part1_size_993284096/StorageAccess"))->call(QStringLiteral("setup")); 761​ fakeDevice(QStringLiteral("/org/kde/solid/fakehw/volume_part1_size_993284096/StorageAccess"))->call(QStringLiteral("setup"));
804 762​
805 QCOMPARE(spy_changed.count(), 1); 763​ QCOMPARE(spy_changed.count(), 1);
806 args = spy_changed.takeFirst(); 764​ args = spy_changed.takeFirst();
807 QCOMPARE(args.at(0).toModelIndex().row(), 7); 765​ QCOMPARE(args.at(0).toModelIndex().row(), 6);
808 QCOMPARE(args.at(1).toModelIndex().row(), 7); 766​ QCOMPARE(args.at(1).toModelIndex().row(), 6);
809} 767​}
810 768​
811void KFilePlacesModelTest::testEnableBaloo() 769​void KFilePlacesModelTest::testEnableBaloo()
812{ 770​{
813 KConfig config(QStringLiteral("baloofilerc")); 771​ KConfig config(QStringLiteral("baloofilerc"));
814 KConfigGroup basicSettings = config.group("Basic Settings"); 772​ KConfigGroup basicSettings = config.group("Basic Settings");
815 basicSettings.writeEntry("Indexing-Enabled", true); 773​ basicSettings.writeEntry("Indexing-Enabled", true);
816 config.sync(); 774​ config.sync();
Show All 15 Lines
832} 790​}
833 791​
834void KFilePlacesModelTest::testRemoteUrls_data() 792​void KFilePlacesModelTest::testRemoteUrls_data()
835{ 793​{
836 QTest::addColumn<QUrl>("url"); 794​ QTest::addColumn<QUrl>("url");
837 QTest::addColumn<int>("expectedRow"); 795​ QTest::addColumn<int>("expectedRow");
838 QTest::addColumn<QString>("expectedGroup"); 796​ QTest::addColumn<QString>("expectedGroup");
839 797​
840 QTest::newRow("Ftp") << QUrl(QStringLiteral("ftp://192.168.1.1/ftp")) << 5 << QStringLiteral("Remote"); 798​ QTest::newRow("Ftp") << QUrl(QStringLiteral("ftp://192.168.1.1/ftp")) << 4 << QStringLiteral("Remote");
841 QTest::newRow("Samba") << QUrl(QStringLiteral("smb://192.168.1.1/share")) << 5 << QStringLiteral("Remote"); 799​ QTest::newRow("Samba") << QUrl(QStringLiteral("smb://192.168.1.1/share")) << 4 << QStringLiteral("Remote");
842 QTest::newRow("Sftp") << QUrl(QStringLiteral("sftp://192.168.1.1/share")) << 5 << QStringLiteral("Remote"); 800​ QTest::newRow("Sftp") << QUrl(QStringLiteral("sftp://192.168.1.1/share")) << 4 << QStringLiteral("Remote");
843 QTest::newRow("Fish") << QUrl(QStringLiteral("fish://192.168.1.1/share")) << 5 << QStringLiteral("Remote"); 801​ QTest::newRow("Fish") << QUrl(QStringLiteral("fish://192.168.1.1/share")) << 4 << QStringLiteral("Remote");
844 QTest::newRow("Webdav") << QUrl(QStringLiteral("webdav://192.168.1.1/share")) << 5 << QStringLiteral("Remote"); 802​ QTest::newRow("Webdav") << QUrl(QStringLiteral("webdav://192.168.1.1/share")) << 4 << QStringLiteral("Remote");
845} 803​}
846 804​
847void KFilePlacesModelTest::testRemoteUrls() 805​void KFilePlacesModelTest::testRemoteUrls()
848{ 806​{
849 QFETCH(QUrl, url); 807​ QFETCH(QUrl, url);
850 QFETCH(int, expectedRow); 808​ QFETCH(int, expectedRow);
851 QFETCH(QString, expectedGroup); 809​ QFETCH(QString, expectedGroup);
852 810​
853 QList<QVariant> args; 811​ QList<QVariant> args;
854 QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int))); 812​ QSignalSpy spy_inserted(m_places, SIGNAL(rowsInserted(QModelIndex,int,int)));
855 813​
856 // insert a new network url 814​ // insert a new network url
857 m_places->addPlace(QStringLiteral("My Shared"), url, QString(), QString(), QModelIndex()); 815​ m_places->addPlace(QStringLiteral("My Shared"), url, QString(), QString(), QModelIndex());
858 816​
859 // check if url list is correct after insertion 817​ // check if url list is correct after insertion
860 QStringList urls; 818​ QStringList urls;
861 urls << QDir::homePath() << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") // places 819​ urls << QDir::homePath() << QStringLiteral("trash:/") // places
862 << QStringLiteral("remote:/") << QStringLiteral("/media/nfs") 820​ << QStringLiteral("remote:/") << QStringLiteral("/media/nfs")
863 << url.toString() << QStringLiteral("/foreign") 821​ << url.toString() << QStringLiteral("/foreign")
864 << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom"); 822​ << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom");
865 CHECK_PLACES_URLS(urls); 823​ CHECK_PLACES_URLS(urls);
866 824​
867 // check if the new url was inserted in the right position (end of "Remote" section) 825​ // check if the new url was inserted in the right position (end of "Remote" section)
868 QTRY_COMPARE(spy_inserted.count(), 1); 826​ QTRY_COMPARE(spy_inserted.count(), 1);
869 args = spy_inserted.takeFirst(); 827​ args = spy_inserted.takeFirst();
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Line(s)
975void KFilePlacesModelTest::testIconRole_data() 933​void KFilePlacesModelTest::testIconRole_data()
976{ 934​{
977 QTest::addColumn<QModelIndex>("index"); 935​ QTest::addColumn<QModelIndex>("index");
978 QTest::addColumn<QString>("expectedIconName"); 936​ QTest::addColumn<QString>("expectedIconName");
979 937​
980 // places 938​ // places
981 QTest::newRow("Places - Home") << m_places->index(0, 0) 939​ QTest::newRow("Places - Home") << m_places->index(0, 0)
982 << QStringLiteral("user-home"); 940​ << QStringLiteral("user-home");
983 QTest::newRow("Places - Root") << m_places->index(1, 0) 941​ QTest::newRow("Places - Trash") << m_places->index(1, 0)
984 << QStringLiteral("folder-root"); ​
985 QTest::newRow("Places - Trash") << m_places->index(2, 0) ​
986 << QStringLiteral("user-trash"); 942​ << QStringLiteral("user-trash");
987 QTest::newRow("Remote - Network") << m_places->index(3, 0) 943​ QTest::newRow("Remote - Network") << m_places->index(2, 0)
988 << QStringLiteral("folder-network"); 944​ << QStringLiteral("folder-network");
989 QTest::newRow("Devices - Nfs") << m_places->index(4, 0) 945​ QTest::newRow("Devices - Nfs") << m_places->index(3, 0)
990 << QStringLiteral("hwinfo"); 946​ << QStringLiteral("hwinfo");
991 QTest::newRow("Devices - foreign") << m_places->index(5, 0) 947​ QTest::newRow("Devices - foreign") << m_places->index(4, 0)
992 << QStringLiteral("blockdevice"); 948​ << QStringLiteral("blockdevice");
993 QTest::newRow("Devices - Floppy") << m_places->index(6, 0) 949​ QTest::newRow("Devices - Floppy") << m_places->index(5, 0)
994 << QStringLiteral("blockdevice"); 950​ << QStringLiteral("blockdevice");
995 QTest::newRow("Devices - cdrom") << m_places->index(7, 0) 951​ QTest::newRow("Devices - cdrom") << m_places->index(6, 0)
996 << QStringLiteral("blockdevice"); 952​ << QStringLiteral("blockdevice");
997} 953​}
998 954​
999void KFilePlacesModelTest::testIconRole() 955​void KFilePlacesModelTest::testIconRole()
1000{ 956​{
1001 QFETCH(QModelIndex, index); 957​ QFETCH(QModelIndex, index);
1002 QFETCH(QString, expectedIconName); 958​ QFETCH(QString, expectedIconName);
1003 959​
1004 QVERIFY(index.data(KFilePlacesModel::IconNameRole).toString().startsWith(expectedIconName)); 960​ QVERIFY(index.data(KFilePlacesModel::IconNameRole).toString().startsWith(expectedIconName));
1005} 961​}
1006 962​
1007void KFilePlacesModelTest::testMoveFunction() 963​void KFilePlacesModelTest::testMoveFunction()
1008{ 964​{
1009 QList<QVariant> args; 965​ QList<QVariant> args;
1010 QStringList urls = initialListOfUrls(); 966​ QStringList urls = initialListOfUrls();
1011 QSignalSpy rowsMoved(m_places, &KFilePlacesModel::rowsMoved); 967​ QSignalSpy rowsMoved(m_places, &KFilePlacesModel::rowsMoved);
1012 968​
1013 // move item 0 to pos 2 969​ // move item 0 to pos 1
1014 QVERIFY(m_places->movePlace(0, 3)); 970​ QVERIFY(m_places->movePlace(0, 2));
1015 urls.move(0, 2); 971​ urls.move(0, 1);
1016 QTRY_COMPARE(rowsMoved.count(), 1); 972​ QTRY_COMPARE(rowsMoved.count(), 1);
1017 args = rowsMoved.takeFirst(); 973​ args = rowsMoved.takeFirst();
1018 QCOMPARE(args.at(1).toInt(), 0); // start 974​ QCOMPARE(args.at(1).toInt(), 0); // start
1019 QCOMPARE(args.at(2).toInt(), 0); // end 975​ QCOMPARE(args.at(2).toInt(), 0); // end
1020 QCOMPARE(args.at(4).toInt(), 3); // row (destination) 976​ QCOMPARE(args.at(4).toInt(), 2); // row (destination)
1021 QCOMPARE(placesUrls(), urls); 977​ QCOMPARE(placesUrls(), urls);
1022 rowsMoved.clear(); 978​ rowsMoved.clear();
1023 979​
1024 // move it back 980​ // move it back
1025 QVERIFY(m_places->movePlace(2, 0)); 981​ QVERIFY(m_places->movePlace(1, 0));
1026 urls.move(2, 0); 982​ urls.move(1, 0);
1027 QTRY_COMPARE(rowsMoved.count(), 1); 983​ QTRY_COMPARE(rowsMoved.count(), 1);
1028 args = rowsMoved.takeFirst(); 984​ args = rowsMoved.takeFirst();
1029 QCOMPARE(args.at(1).toInt(), 2); // start 985​ QCOMPARE(args.at(1).toInt(), 1); // start
1030 QCOMPARE(args.at(2).toInt(), 2); // end 986​ QCOMPARE(args.at(2).toInt(), 1); // end
1031 QCOMPARE(args.at(4).toInt(), 0); // row (destination) 987​ QCOMPARE(args.at(4).toInt(), 0); // row (destination)
1032 QCOMPARE(placesUrls(), urls); 988​ QCOMPARE(placesUrls(), urls);
1033 rowsMoved.clear(); 989​ rowsMoved.clear();
1034 990​
1035 // target position is greater than model rows 991​ // target position is greater than model rows
1036 // will move to the end of the first group 992​ // will move to the end of the first group
1037 QVERIFY(m_places->movePlace(0, 20)); 993​ QVERIFY(m_places->movePlace(0, 20));
1038 urls.move(0, 2); 994​ urls.move(0, 1);
1039 QTRY_COMPARE(rowsMoved.count(), 1); 995​ QTRY_COMPARE(rowsMoved.count(), 1);
1040 args = rowsMoved.takeFirst(); 996​ args = rowsMoved.takeFirst();
1041 QCOMPARE(args.at(1).toInt(), 0); // start 997​ QCOMPARE(args.at(1).toInt(), 0); // start
1042 QCOMPARE(args.at(2).toInt(), 0); // end 998​ QCOMPARE(args.at(2).toInt(), 0); // end
1043 QCOMPARE(args.at(4).toInt(), 3); // row (destination) 999​ QCOMPARE(args.at(4).toInt(), 2); // row (destination)
1044 QCOMPARE(placesUrls(), urls); 1000​ QCOMPARE(placesUrls(), urls);
1045 rowsMoved.clear(); 1001​ rowsMoved.clear();
1046 1002​
1047 // move it back 1003​ // move it back
1048 QVERIFY(m_places->movePlace(2, 0)); 1004​ QVERIFY(m_places->movePlace(1, 0));
1049 urls.move(2, 0); 1005​ urls.move(1, 0);
1050 QTRY_COMPARE(rowsMoved.count(), 1); 1006​ QTRY_COMPARE(rowsMoved.count(), 1);
1051 args = rowsMoved.takeFirst(); 1007​ args = rowsMoved.takeFirst();
1052 QCOMPARE(args.at(1).toInt(), 2); // start 1008​ QCOMPARE(args.at(1).toInt(), 1); // start
1053 QCOMPARE(args.at(2).toInt(), 2); // end 1009​ QCOMPARE(args.at(2).toInt(), 1); // end
1054 QCOMPARE(args.at(4).toInt(), 0); // row (destination) 1010​ QCOMPARE(args.at(4).toInt(), 0); // row (destination)
1055 QCOMPARE(placesUrls(), urls); 1011​ QCOMPARE(placesUrls(), urls);
1056 rowsMoved.clear(); 1012​ rowsMoved.clear();
1057 1013​
1058 QVERIFY(m_places->movePlace(8, 6)); 1014​ QVERIFY(m_places->movePlace(7, 5));
1059 urls.move(8, 6); 1015​ urls.move(7, 5);
1060 QTRY_COMPARE(rowsMoved.count(), 1); 1016​ QTRY_COMPARE(rowsMoved.count(), 1);
1061 args = rowsMoved.takeFirst(); 1017​ args = rowsMoved.takeFirst();
1062 QCOMPARE(args.at(1).toInt(), 8); // start 1018​ QCOMPARE(args.at(1).toInt(), 7); // start
1063 QCOMPARE(args.at(2).toInt(), 8); // end 1019​ QCOMPARE(args.at(2).toInt(), 7); // end
1064 QCOMPARE(args.at(4).toInt(), 6); // row (destination) 1020​ QCOMPARE(args.at(4).toInt(), 5); // row (destination)
1065 QCOMPARE(placesUrls(), urls); 1021​ QCOMPARE(placesUrls(), urls);
1066 rowsMoved.clear(); 1022​ rowsMoved.clear();
1067 1023​
1068 // move it back 1024​ // move it back
1069 QVERIFY(m_places->movePlace(6, 9)); 1025​ QVERIFY(m_places->movePlace(5, 8));
1070 urls.move(6, 8); 1026​ urls.move(5, 7);
1071 QTRY_COMPARE(rowsMoved.count(), 1); 1027​ QTRY_COMPARE(rowsMoved.count(), 1);
1072 args = rowsMoved.takeFirst(); 1028​ args = rowsMoved.takeFirst();
1073 QCOMPARE(args.at(1).toInt(), 6); // start 1029​ QCOMPARE(args.at(1).toInt(), 5); // start
1074 QCOMPARE(args.at(2).toInt(), 6); // end 1030​ QCOMPARE(args.at(2).toInt(), 5); // end
1075 QCOMPARE(args.at(4).toInt(), 9); // row (destination) 1031​ QCOMPARE(args.at(4).toInt(), 8); // row (destination)
1076 QCOMPARE(placesUrls(), urls); 1032​ QCOMPARE(placesUrls(), urls);
1077 rowsMoved.clear(); 1033​ rowsMoved.clear();
1078 1034​
1079 //use a invalid start position 1035​ //use a invalid start position
1080 QVERIFY(!m_places->movePlace(100, 20)); 1036​ QVERIFY(!m_places->movePlace(100, 20));
1081 QCOMPARE(rowsMoved.count(), 0); 1037​ QCOMPARE(rowsMoved.count(), 0);
1082 1038​
1083 //use same start and target position 1039​ //use same start and target position
▲ Show 20 Lines • Show All 228 Lines • Show Last 20 Lines