on xenial help sign in
Tests: Do not use dynamic_cast if we're not going to test it anyway

We know those things are those things, so static_cast is enough

commit80022084927265fade593b6123179b17c3cbb3c5 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 17 Jun 2016, 01:15 (10 years ago) parent21a217d93ab80b
9 files changed+9−9
tests/mocks/Unity/fake_previewmodel.cpp+1−1 tests/mocks/Unity/fake_scope.cpp+1−1 tests/mocks/Unity/fake_scopesoverview.cpp+1−1 tests/plugins/Dash/horizontaljournaltest.cpp+1−1 tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp+1−1 tests/plugins/Dash/listviewwithpageheadersectiontest.cpp+1−1 tests/plugins/Dash/listviewwithpageheadertest.cpp+1−1 tests/plugins/Dash/organicgridtest.cpp+1−1 tests/plugins/Dash/verticaljournaltest.cpp+1−1
tests/mocks/Unity/fake_previewmodel.cpp+1−1
@@ -87,7 +87,7 @@ void PreviewModel::setLoaded(bool loaded)
8787
8888void PreviewModel::triggeredSlot(QString const&, QString const&, QVariantMap const&) {
8989 if (m_scope) {
90− Scopes *scopes = dynamic_cast<Scopes*>(m_scope->parent());
90+ Scopes *scopes = static_cast<Scopes*>(m_scope->parent());
9191 Scope* scope = scopes->getScopeFromAll("MockScope9");
9292 scopes->addTempScope(scope);
9393 Q_EMIT m_scope->openScope(scope);
tests/mocks/Unity/fake_scope.cpp+1−1
@@ -199,7 +199,7 @@ void Scope::activate(QVariant const& result, QString const& categoryId)
199199{
200200 qDebug() << "Called activate on scope" << m_id << "with result" << result << "and category" << categoryId;
201201 if (result.toString() == "Result.2.2") {
202− Scopes *scopes = dynamic_cast<Scopes*>(parent());
202+ Scopes *scopes = static_cast<Scopes*>(parent());
203203 m_openScope = scopes->getScopeFromAll("MockScope9");
204204 scopes->addTempScope(m_openScope);
205205 Q_EMIT openScope(m_openScope);
tests/mocks/Unity/fake_scopesoverview.cpp+1−1
@@ -43,7 +43,7 @@ void ScopesOverview::setSearchQuery(const QString& search_query)
4343
4444Q_INVOKABLE void ScopesOverview::activate(QVariant const& result, QString const& /*categoryId*/)
4545{
46− Scopes *scopes = dynamic_cast<Scopes*>(parent());
46+ Scopes *scopes = static_cast<Scopes*>(parent());
4747 if (scopes->getScope(result.toString())) {
4848 Q_EMIT gotoScope(result.toString());
4949 } else {
tests/plugins/Dash/horizontaljournaltest.cpp+1−1
@@ -135,7 +135,7 @@ private Q_SLOTS:
135135 view->resize(470, 400);
136136 QTest::qWaitForWindowExposed(view);
137137
138− hj = dynamic_cast<HorizontalJournal*>(view->rootObject()->findChild<QObject*>("hj"));
138+ hj = static_cast<HorizontalJournal*>(view->rootObject()->findChild<QObject*>("hj"));
139139 hj->setModel(model);
140140
141141 checkInitialPositions();
tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp+1−1
@@ -169,7 +169,7 @@ private Q_SLOTS:
169169 {
170170 view = new QQuickView();
171171 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsectionexternalmodel.qml"));
172− lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
172+ lvwph = static_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
173173 QVERIFY(lvwph);
174174 view->show();
175175 QTest::qWaitForWindowExposed(view);
tests/plugins/Dash/listviewwithpageheadersectiontest.cpp+1−1
@@ -134,7 +134,7 @@ private Q_SLOTS:
134134 {
135135 view = new QQuickView();
136136 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));
137− lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
137+ lvwph = static_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
138138 model = view->rootObject()->findChild<QQmlListModel*>();
139139 otherDelegate = view->rootObject()->findChild<QQmlComponent*>();
140140 QVERIFY(lvwph);
tests/plugins/Dash/listviewwithpageheadertest.cpp+1−1
@@ -125,7 +125,7 @@ private Q_SLOTS:
125125 {
126126 view = new QQuickView();
127127 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));
128− lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
128+ lvwph = static_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
129129 model = view->rootObject()->findChild<QQmlListModel*>();
130130 otherDelegate = view->rootObject()->findChild<QQmlComponent*>();
131131 QVERIFY(lvwph);
tests/plugins/Dash/organicgridtest.cpp+1−1
@@ -136,7 +136,7 @@ private Q_SLOTS:
136136 QTest::qWaitForWindowExposed(view);
137137 view->resize(470, 400);
138138
139− grid = dynamic_cast<OrganicGrid*>(view->rootObject()->findChild<QObject*>("grid"));
139+ grid = static_cast<OrganicGrid*>(view->rootObject()->findChild<QObject*>("grid"));
140140 grid->setModel(model);
141141 QTRY_COMPARE(grid->width(), 470.);
142142
tests/plugins/Dash/verticaljournaltest.cpp+1−1
@@ -137,7 +137,7 @@ private Q_SLOTS:
137137 QTest::qWaitForWindowExposed(view);
138138 view->resize(470, 400);
139139
140− vj = dynamic_cast<VerticalJournal*>(view->rootObject()->findChild<QObject*>("vj"));
140+ vj = static_cast<VerticalJournal*>(view->rootObject()->findChild<QObject*>("vj"));
141141 vj->setModel(model);
142142 QTRY_COMPARE(vj->width(), 470.);
143143