6497f8e · unity8 · git.iko.soy

git.iko.soy/unity8

test libertine

commit6497f8e613ea2074dab25979b516cc47f7f8106a authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 6 Jun 2016, 23:33 (10 years ago) parentc66370c

4 files changed+13−3

compare with xenial

unifiedsplit

tests/mocks/Unity/fake_scopes.cpp+1 tests/qmltests/Dash/tst_Dash.qml+10−1 tests/qmltests/Dash/tst_DashContent.qml+1−1 tests/qmltests/Dash/tst_DashShell.qml+1−1

tests/mocks/Unity/fake_scopes.cpp+1

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

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

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

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

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

6364

6465 Scope *longNavigationScope = new Scope(

6566 "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,

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

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

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

5959 scopes.load();

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

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

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

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

6363 tryCompareFunction(function() {

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

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

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

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

654654 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);

655664 }

656665

657666 function test_tempScopeItemXOnResize()

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

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

124124

125125 loadScopes();

126126

127− compare(dashContentList.count, 7);

127+ compare(dashContentList.count, 8);

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

129129 }

130130

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", 7);

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

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

6565 tryCompareFunction(function() {

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