git.iko.soy/unity8
on xenial help sign in
Fix genericscopeview tests now that the 6 column limit has disappeared
9a5b11dAlbert Astals Cid
tests/mocks/Unity/fake_categories.cpp+1−1
compare with xenial
unifiedsplit
@@ -141,7 +141,7 @@ ResultsModel* Categories::resultModel(int row) const
141 ResultsModel *result = m_resultsModels[row];
141 ResultsModel *result = m_resultsModels[row];
142 if (!result) {
142 if (!result) {
143 Categories *that = const_cast<Categories*>(this);
143 Categories *that = const_cast<Categories*>(this);
144− result = new ResultsModel(15, row, that);
144+ result = new ResultsModel(25, row, that);
145 m_resultsModels[row] = result;
145 m_resultsModels[row] = result;
146 }
146 }
147 return result;
147 return result;
tests/qmltests/Dash/tst_GenericScopeView.qml+4−4
@@ -238,7 +238,7 @@ Item {
238
238
239 openPreview(4, 0);
239 openPreview(4, 0);
240
240
241− compare(testCase.subPageLoader.count, 12, "There should only be 12 items in preview.");
241+ compare(testCase.subPageLoader.count, 16, "There should only be 16 items in preview.");
242
242
243 closePreview();
243 closePreview();
244 }
244 }
@@ -413,7 +413,7 @@ Item {
413 var previewListViewList = findChild(subPageLoader.item, "listView");
413 var previewListViewList = findChild(subPageLoader.item, "listView");
414
414
415 // flick to the next previews
415 // flick to the next previews
416− tryCompare(testCase.subPageLoader, "count", 15);
416+ tryCompare(testCase.subPageLoader, "count", 25);
417 for (var i = 1; i < testCase.subPageLoader.count; ++i) {
417 for (var i = 1; i < testCase.subPageLoader.count; ++i) {
418 mouseFlick(testCase.subPageLoader.item, testCase.subPageLoader.width - units.gu(1),
418 mouseFlick(testCase.subPageLoader.item, testCase.subPageLoader.width - units.gu(1),
419 testCase.subPageLoader.height / 2,
419 testCase.subPageLoader.height / 2,
@@ -487,7 +487,7 @@ Item {
487 mockScope.setName("Mock Scope");
487 mockScope.setName("Mock Scope");
488 mockScope.categories.setCount(2);
488 mockScope.categories.setCount(2);
489 mockScope.categories.resultModel(0).setResultCount(50);
489 mockScope.categories.resultModel(0).setResultCount(50);
490− mockScope.categories.resultModel(1).setResultCount(15);
490+ mockScope.categories.resultModel(1).setResultCount(25);
491 mockScope.categories.setLayout(0, "grid");
491 mockScope.categories.setLayout(0, "grid");
492 mockScope.categories.setLayout(1, "grid");
492 mockScope.categories.setLayout(1, "grid");
493 mockScope.categories.setHeaderLink(0, "");
493 mockScope.categories.setHeaderLink(0, "");
@@ -529,7 +529,7 @@ Item {
529 mockScope.setId("mockScope");
529 mockScope.setId("mockScope");
530 mockScope.setName("Mock Scope");
530 mockScope.setName("Mock Scope");
531 mockScope.categories.setCount(2);
531 mockScope.categories.setCount(2);
532− mockScope.categories.resultModel(0).setResultCount(15);
532+ mockScope.categories.resultModel(0).setResultCount(25);
533 mockScope.categories.resultModel(1).setResultCount(50);
533 mockScope.categories.resultModel(1).setResultCount(50);
534 mockScope.categories.setLayout(0, "grid");
534 mockScope.categories.setLayout(0, "grid");
535 mockScope.categories.setLayout(1, "grid");
535 mockScope.categories.setLayout(1, "grid");