a1ef65a · unity8 · git.iko.soy

git.iko.soy/unity8

Fix content tests

commita1ef65a19394bc615db33a3413a9b44c36a41047 authorJosh Arenson <joshua.arenson@canonical.com> dateThu 17 Nov 2016, 13:43 (10 years ago) parent356c4bb

3 files changed+5−5

compare with xenial

unifiedsplit

tests/qmltests/Dash/tst_Dash.qml+1−1 tests/qmltests/Dash/tst_DashContent.qml+3−3 tests/qmltests/Dash/tst_DashShell.qml+1−1

tests/qmltests/Dash/tst_Dash.qml+1−1

@@ -58,7 +58,7 @@ Item {

5858 tryCompare(dashContentList, "count", 0);

5959 scopes.load();

6060 tryCompare(dashContentList, "currentIndex", 0);

61− tryCompare(dashContentList, "count", 8);

61+ tryCompare(dashContentList, "count", 28);

6262 tryCompare(scopes, "loaded", true);

6363 tryCompareFunction(function() {

6464 var mockScope1Loader = findChild(dash, "scopeLoader0");

tests/qmltests/Dash/tst_DashContent.qml+3−3

@@ -70,7 +70,7 @@ Item {

7070 function loadScopes() {

7171 scopeLoadedSpy.clear();

7272 scopesModel.load();

73− tryCompare(scopeLoadedSpy, "count", 8, 15000);

73+ tryCompare(scopeLoadedSpy, "count", 28, 15000);

7474 tryCompare(scopesModel, "loaded", true);

7575 tryCompareFunction(function() {

7676 var mockScope1Loader = findChild(shell, "scopeLoader0");

@@ -124,7 +124,7 @@ Item {

124124

125125 loadScopes();

126126

127− compare(dashContentList.count, 8);

127+ compare(dashContentList.count, 28);

128128 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);

129129 }

130130

@@ -181,7 +181,7 @@ Item {

181181

182182 // test greater than scope count.

183183 var currentScopeIndex = dashContent.currentIndex;

184− dashContent.setCurrentScopeAtIndex(18, true, false);

184+ dashContent.setCurrentScopeAtIndex(29, true, false);

185185 compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");

186186 }

187187

tests/qmltests/Dash/tst_DashShell.qml+1−1

@@ -60,7 +60,7 @@ Item {

6060 tryCompare(dashContentList, "count", 0);

6161 scopes.load();

6262 tryCompare(dashContentList, "currentIndex", 0);

63− tryCompare(dashContentList, "count", 8);

63+ tryCompare(dashContentList, "count", 28);

6464 tryCompare(scopes, "loaded", true);

6565 tryCompareFunction(function() {

6666 var mockScope1Loader = findChild(dash, "scopeLoader0");