6497f8e · unity8 · git.iko.soy

tests/mocks/Unity/fake_scopes.cpp+1

compare with xenial

unifiedsplit

@@ -60,6 +60,7 @@ void Scopes::updateScopes()

60 addScope(new Scope("MockScope7", "MS7", false, this));

61 addScope(new Scope("MockScope8", "MS8", false, this));

62 addScope(new Scope("MockScope9", "MS9", false, this));

63+ addScope(new Scope("libertine-scope.ubuntu_libertine-scope", "Libertine", true, this));

63

64

64 Scope *longNavigationScope = new Scope(

65 Scope *longNavigationScope = new Scope(

65 "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,

66 "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,

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

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

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

59 scopes.load();

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

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

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

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

63 tryCompareFunction(function() {

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

@@ -652,6 +652,15 @@ Item {

652 var tile = getCategoryDelegate("predefined", 2);

653 var proportionalShape = findChildsByType(tile, "UCProportionalShape");

654 compare(proportionalShape.length, 1);

655+

656+ dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");

657+ var dashContent = findChild(dash, "dashContent");

658+ tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");

659+

660+ scrollToCategory("dashCategory2");

661+ tile = getCategoryDelegate("2", 2);

662+ proportionalShape = findChildsByType(tile, "UCProportionalShape");

663+ compare(proportionalShape.length, 1);

655 }

664 }

656

665

657 function test_tempScopeItemXOnResize()

666 function test_tempScopeItemXOnResize()

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

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

124

125 loadScopes();

126

127− compare(dashContentList.count, 7);

127+ compare(dashContentList.count, 8);

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

129 }

130

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

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

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

61 scopes.load();

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

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

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

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

65 tryCompareFunction(function() {

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