diff options
| author | Frank Reininghaus <[email protected]> | 2012-02-13 20:15:02 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2012-02-13 20:21:57 +0100 |
| commit | e1766d0e5f0f71b37ca7cc5adbe56de5e6bf8b57 (patch) | |
| tree | 098d5297a00b1dabca5d04ebbc6ee74bd2f1f7be /src/tests/kitemlistcontrollertest.cpp | |
| parent | 056d12d60f93a052e19f6e2cff9b826e500eef16 (diff) | |
Fix regression in KItemListControllerTest
Since commit 66ce4db4879cd80b2dcb6d65a0c74599c5e5f0ba, enabling or
disabling groupling may change the number of columns in the view.
Therefore, the test should first change the "grouping" setting and then
change the view geometry to make sure that the column count is correct.
(cherry picked from commit 61390b201acae2d8eea94fefc947977a8799af85)
Diffstat (limited to 'src/tests/kitemlistcontrollertest.cpp')
| -rw-r--r-- | src/tests/kitemlistcontrollertest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp index 7944d6d34..f62ef0c3e 100644 --- a/src/tests/kitemlistcontrollertest.cpp +++ b/src/tests/kitemlistcontrollertest.cpp @@ -447,15 +447,15 @@ void KItemListControllerTest::testKeyboardNavigation() m_view->setScrollOrientation(scrollOrientation); QCOMPARE(m_view->scrollOrientation(), scrollOrientation); - adjustGeometryForColumnCount(columnCount); - QCOMPARE(m_view->m_layouter->m_columnCount, columnCount); - m_controller->setSelectionBehavior(selectionBehavior); QCOMPARE(m_controller->selectionBehavior(), selectionBehavior); m_model->setGroupedSorting(groupingEnabled); QCOMPARE(m_model->groupedSorting(), groupingEnabled); + adjustGeometryForColumnCount(columnCount); + QCOMPARE(m_view->m_layouter->m_columnCount, columnCount); + while (!testList.isEmpty()) { const QPair<KeyPress, ViewState> test = testList.takeFirst(); const Qt::Key key = test.first.m_key; |
