git.iko.soy/unity8
on xenial help sign in
update qmltests for new objectName
fce573eMichael Zanetti
tests/qmltests/Dash/tst_Dash.qml+3−3
compare with xenial
unifiedsplit
@@ -56,14 +56,14 @@ Item {
56 tryCompare(dashContentList, "count", 6);
56 tryCompare(dashContentList, "count", 6);
57 tryCompare(scopes, "loaded", true);
57 tryCompare(scopes, "loaded", true);
58 tryCompareFunction(function() {
58 tryCompareFunction(function() {
59− var mockScope1Loader = findChild(dash, "MockScope1 loader");
59+ var mockScope1Loader = findChild(dash, "scopeLoader0");
60 return mockScope1Loader && mockScope1Loader.item != null; },
60 return mockScope1Loader && mockScope1Loader.item != null; },
61 true, 15000);
61 true, 15000);
62 tryCompareFunction(function() {
62 tryCompareFunction(function() {
63− var mockScope1Loader = findChild(dash, "MockScope1 loader");
63+ var mockScope1Loader = findChild(dash, "scopeLoader0");
64 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },
64 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },
65 true, 15000);
65 true, 15000);
66− waitForRendering(findChild(dash, "MockScope1 loader").item);
66+ waitForRendering(findChild(dash, "scopeLoader0").item);
67 }
67 }
68
68
69 function get_scope_data() {
69 function get_scope_data() {
tests/qmltests/Dash/tst_DashContent.qml+8−8
@@ -73,14 +73,14 @@ Item {
73 tryCompare(scopeLoadedSpy, "count", 6, 15000);
73 tryCompare(scopeLoadedSpy, "count", 6, 15000);
74 tryCompare(scopesModel, "loaded", true);
74 tryCompare(scopesModel, "loaded", true);
75 tryCompareFunction(function() {
75 tryCompareFunction(function() {
76− var mockScope1Loader = findChild(shell, "MockScope1 loader");
76+ var mockScope1Loader = findChild(shell, "scopeLoader0");
77 return mockScope1Loader && mockScope1Loader.item != null; },
77 return mockScope1Loader && mockScope1Loader.item != null; },
78 true, 15000);
78 true, 15000);
79 tryCompareFunction(function() {
79 tryCompareFunction(function() {
80− var mockScope1Loader = findChild(shell, "MockScope1 loader");
80+ var mockScope1Loader = findChild(shell, "scopeLoader0");
81 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },
81 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },
82 true, 15000);
82 true, 15000);
83− waitForRendering(findChild(shell, "MockScope1 loader").item);
83+ waitForRendering(findChild(shell, "scopeLoader0").item);
84 }
84 }
85
85
86 function init() {
86 function init() {
@@ -131,7 +131,7 @@ Item {
131 function test_show_header_on_list_movement() {
131 function test_show_header_on_list_movement() {
132 var dashContentList = findChild(dashContent, "dashContentList");
132 var dashContentList = findChild(dashContent, "dashContentList");
133 verify(dashContentList !== null);
133 verify(dashContentList !== null);
134− var scope = findChild(dashContent, "MockScope1 loader");
134+ var scope = findChild(dashContent, "scopeLoader0");
135 waitForRendering(scope);
135 waitForRendering(scope);
136
136
137 var categoryListView = findChild(scope, "categoryListView");
137 var categoryListView = findChild(scope, "categoryListView");
@@ -149,7 +149,7 @@ Item {
149 function test_set_current_scope_reset() {
149 function test_set_current_scope_reset() {
150 var dashContentList = findChild(dashContent, "dashContentList");
150 var dashContentList = findChild(dashContent, "dashContentList");
151 verify(dashContentList, "Couldn't find dashContentList");
151 verify(dashContentList, "Couldn't find dashContentList");
152− var scope = findChild(dashContent, "MockScope1 loader");
152+ var scope = findChild(dashContent, "scopeLoader0");
153
153
154 tryCompare(scope, "status", Loader.Ready);
154 tryCompare(scope, "status", Loader.Ready);
155
155
@@ -261,7 +261,7 @@ Item {
261
261
262 function test_carouselAspectRatio() {
262 function test_carouselAspectRatio() {
263 tryCompareFunction(function() {
263 tryCompareFunction(function() {
264− var scope = findChild(dashContent, "MockScope1 loader");
264+ var scope = findChild(dashContent, "scopeLoader0");
265 if (scope != null) {
265 if (scope != null) {
266 var dashCategory1 = findChild(scope, "dashCategory1");
266 var dashCategory1 = findChild(scope, "dashCategory1");
267 if (dashCategory1 != null) {
267 if (dashCategory1 != null) {
@@ -273,7 +273,7 @@ Item {
273 },
273 },
274 true);
274 true);
275
275
276− var scope = findChild(dashContent, "MockScope1 loader");
276+ var scope = findChild(dashContent, "scopeLoader0");
277 var dashCategory1 = findChild(scope, "dashCategory1");
277 var dashCategory1 = findChild(scope, "dashCategory1");
278 var cardTool = findChild(dashCategory1, "cardTool");
278 var cardTool = findChild(dashCategory1, "cardTool");
279 var carouselLV = findChild(dashCategory1, "listView");
279 var carouselLV = findChild(dashCategory1, "listView");
@@ -501,7 +501,7 @@ Item {
501 function test_searchHint() {
501 function test_searchHint() {
502 var dashContentList = findChild(dashContent, "dashContentList");
502 var dashContentList = findChild(dashContent, "dashContentList");
503 verify(dashContentList !== null);
503 verify(dashContentList !== null);
504− var scope = findChild(dashContent, "MockScope1 loader");
504+ var scope = findChild(dashContent, "scopeLoader0");
505 waitForRendering(scope);
505 waitForRendering(scope);
506
506
507 var categoryListView = findChild(scope, "categoryListView");
507 var categoryListView = findChild(scope, "categoryListView");