9a5b11d · unity8 · git.iko.soy

git.iko.soy/unity8

Fix genericscopeview tests now that the 6 column limit has disappeared

commit9a5b11df14c4421917c065f9337a6d612e76813c authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 14 Jan 2016, 10:26 (11 years ago) parent13a0205

2 files changed+5−5

compare with xenial

unifiedsplit

tests/mocks/Unity/fake_categories.cpp+1−1 tests/qmltests/Dash/tst_GenericScopeView.qml+4−4

tests/mocks/Unity/fake_categories.cpp+1−1

@@ -141,7 +141,7 @@ ResultsModel* Categories::resultModel(int row) const

141141 ResultsModel *result = m_resultsModels[row];

142142 if (!result) {

143143 Categories *that = const_cast<Categories*>(this);

144− result = new ResultsModel(15, row, that);

144+ result = new ResultsModel(25, row, that);

145145 m_resultsModels[row] = result;

146146 }

147147 return result;

tests/qmltests/Dash/tst_GenericScopeView.qml+4−4

@@ -238,7 +238,7 @@ Item {

238238

239239 openPreview(4, 0);

240240

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.");

242242

243243 closePreview();

244244 }

@@ -413,7 +413,7 @@ Item {

413413 var previewListViewList = findChild(subPageLoader.item, "listView");

414414

415415 // flick to the next previews

416− tryCompare(testCase.subPageLoader, "count", 15);

416+ tryCompare(testCase.subPageLoader, "count", 25);

417417 for (var i = 1; i < testCase.subPageLoader.count; ++i) {

418418 mouseFlick(testCase.subPageLoader.item, testCase.subPageLoader.width - units.gu(1),

419419 testCase.subPageLoader.height / 2,

@@ -487,7 +487,7 @@ Item {

487487 mockScope.setName("Mock Scope");

488488 mockScope.categories.setCount(2);

489489 mockScope.categories.resultModel(0).setResultCount(50);

490− mockScope.categories.resultModel(1).setResultCount(15);

490+ mockScope.categories.resultModel(1).setResultCount(25);

491491 mockScope.categories.setLayout(0, "grid");

492492 mockScope.categories.setLayout(1, "grid");

493493 mockScope.categories.setHeaderLink(0, "");

@@ -529,7 +529,7 @@ Item {

529529 mockScope.setId("mockScope");

530530 mockScope.setName("Mock Scope");

531531 mockScope.categories.setCount(2);

532− mockScope.categories.resultModel(0).setResultCount(15);

532+ mockScope.categories.resultModel(0).setResultCount(25);

533533 mockScope.categories.resultModel(1).setResultCount(50);

534534 mockScope.categories.setLayout(0, "grid");

535535 mockScope.categories.setLayout(1, "grid");