on xenial help sign in
Fix content tests
a1ef65aJosh Arenson
tests/qmltests/Dash/tst_Dash.qml+1−1
@@ -58,7 +58,7 @@ Item {
58 tryCompare(dashContentList, "count", 0);
58 tryCompare(dashContentList, "count", 0);
59 scopes.load();
59 scopes.load();
60 tryCompare(dashContentList, "currentIndex", 0);
60 tryCompare(dashContentList, "currentIndex", 0);
61− tryCompare(dashContentList, "count", 8);
61+ tryCompare(dashContentList, "count", 28);
62 tryCompare(scopes, "loaded", true);
62 tryCompare(scopes, "loaded", true);
63 tryCompareFunction(function() {
63 tryCompareFunction(function() {
64 var mockScope1Loader = findChild(dash, "scopeLoader0");
64 var mockScope1Loader = findChild(dash, "scopeLoader0");
tests/qmltests/Dash/tst_DashContent.qml+3−3
@@ -70,7 +70,7 @@ Item {
70 function loadScopes() {
70 function loadScopes() {
71 scopeLoadedSpy.clear();
71 scopeLoadedSpy.clear();
72 scopesModel.load();
72 scopesModel.load();
73− tryCompare(scopeLoadedSpy, "count", 8, 15000);
73+ tryCompare(scopeLoadedSpy, "count", 28, 15000);
74 tryCompare(scopesModel, "loaded", true);
74 tryCompare(scopesModel, "loaded", true);
75 tryCompareFunction(function() {
75 tryCompareFunction(function() {
76 var mockScope1Loader = findChild(shell, "scopeLoader0");
76 var mockScope1Loader = findChild(shell, "scopeLoader0");
@@ -124,7 +124,7 @@ Item {
124
124
125 loadScopes();
125 loadScopes();
126
126
127− compare(dashContentList.count, 8);
127+ compare(dashContentList.count, 28);
128 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
128 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
129 }
129 }
130
130
@@ -181,7 +181,7 @@ Item {
181
181
182 // test greater than scope count.
182 // test greater than scope count.
183 var currentScopeIndex = dashContent.currentIndex;
183 var currentScopeIndex = dashContent.currentIndex;
184− dashContent.setCurrentScopeAtIndex(18, true, false);
184+ dashContent.setCurrentScopeAtIndex(29, true, false);
185 compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
185 compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
186 }
186 }
187
187
tests/qmltests/Dash/tst_DashShell.qml+1−1
@@ -60,7 +60,7 @@ Item {
60 tryCompare(dashContentList, "count", 0);
60 tryCompare(dashContentList, "count", 0);
61 scopes.load();
61 scopes.load();
62 tryCompare(dashContentList, "currentIndex", 0);
62 tryCompare(dashContentList, "currentIndex", 0);
63− tryCompare(dashContentList, "count", 8);
63+ tryCompare(dashContentList, "count", 28);
64 tryCompare(scopes, "loaded", true);
64 tryCompare(scopes, "loaded", true);
65 tryCompareFunction(function() {
65 tryCompareFunction(function() {
66 var mockScope1Loader = findChild(dash, "scopeLoader0");
66 var mockScope1Loader = findChild(dash, "scopeLoader0");