X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f45966d9c3f7ac513d87eef024fb328029e89ba5..aefa8ce888ffe9f8699319314672a6bc42f8d95f:/src/tests/testbase.cpp diff --git a/src/tests/testbase.cpp b/src/tests/testbase.cpp index 2161c9314..db71fa48c 100644 --- a/src/tests/testbase.cpp +++ b/src/tests/testbase.cpp @@ -39,22 +39,12 @@ TestBase::TestBase() Q_ASSERT(m_tempDir->exists()); m_path = m_tempDir->name(); m_dir = new QDir(m_path); - m_dirLister = new DolphinDirLister(); - m_dirLister->setAutoUpdate(true); - m_dolphinModel = new DolphinModel(); - m_dolphinModel->setDirLister(m_dirLister); - m_proxyModel = new DolphinSortFilterProxyModel(0); - m_proxyModel->setSourceModel(m_dolphinModel); - m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); - m_view = new DolphinView(0, KUrl(m_path), m_proxyModel); + m_view = new DolphinView(KUrl(m_path), 0); } TestBase::~TestBase() { delete m_view; - delete m_proxyModel; - // m_dolphinModel owns m_dirLister -> do not delete it here! - delete m_dolphinModel; delete m_dir; delete m_tempDir; } @@ -67,7 +57,7 @@ QAbstractItemView* TestBase::itemView () const void TestBase::reloadViewAndWait() { m_view->reload(); - QVERIFY(QTest::kWaitForSignal(m_view, SIGNAL(finishedPathLoading(const KUrl&)), 5000)); + QVERIFY(QTest::kWaitForSignal(m_view, SIGNAL(finishedPathLoading(const KUrl&)), 2000)); } KUrl TestBase::testDirUrl() const