@@ -47,18 +47,18 @@ Item {
47 model: scopesModel
47 model: scopesModel
48 scopes : scopesModel
48 scopes : scopesModel
50− lensMapper : lensDelegateMapper
50+ scopeMapper : scopeDelegateMapper
53− LensDelegateMapper {
53+ ScopeDelegateMapper {
54− id: lensDelegateMapper
54+ id: scopeDelegateMapper
55− lensDelegateMapping: {
55+ scopeDelegateMapping: {
56− "MockLens1": "../tests/qmltests/Dash/qml/fake_lensView1.qml",
56+ "MockScope1": "../tests/qmltests/Dash/qml/fake_scopeView1.qml",
57− "MockLens2": "../tests/qmltests/Dash/qml/fake_lensView2.qml",
57+ "MockScope2": "../tests/qmltests/Dash/qml/fake_scopeView2.qml",
58− "MockLens3": "../tests/qmltests/Dash/qml/fake_lensView3.qml",
58+ "MockScope3": "../tests/qmltests/Dash/qml/fake_scopeView3.qml",
59− "MockLens4": "../tests/qmltests/Dash/qml/fake_lensView4.qml"
59+ "MockScope4": "../tests/qmltests/Dash/qml/fake_scopeView4.qml"
61− genericLens: "../tests/qmltests/Dash/qml/fake_generic_lensView.qml"
61+ genericScope: "../tests/qmltests/Dash/qml/fake_generic_scopeView.qml"
64 function clear_scope_status() {
64 function clear_scope_status() {
@@ -106,7 +106,7 @@ Item {
106 contentEndReachedSpy.clear()
106 contentEndReachedSpy.clear()
107 clear_scope_status();
107 clear_scope_status();
109− // clear, wait for dahs to empty and load lenses.
109+ // clear, wait for dahs to empty and load scopes.
110 var dashContentList = findChild(dashContent, "dashContentList");
110 var dashContentList = findChild(dashContent, "dashContentList");
111 verify(dashContentList != undefined)
111 verify(dashContentList != undefined)
112 scopesModel.clear();
112 scopesModel.clear();
@@ -200,7 +200,7 @@ Item {
202 function test_scope_mapping(data) {
202 function test_scope_mapping(data) {
203− dashContent.setCurrentLensAtIndex(data.index, true, false);
203+ dashContent.setCurrentScopeAtIndex(data.index, true, false);
204 tryCompareFunction(get_current_item_object_name, data.objectName)
204 tryCompareFunction(get_current_item_object_name, data.objectName)