877dfdf · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Adapt test to mock changes

877dfdfAlbert Astals Cid10 years ago

tests/qmltests/Dash/tst_GenericScopeView.qml+7

compare with xenial

unifiedsplit

@@ -76,6 +76,7 @@ Item {

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

78 genericScopeView.scope = scopes.getScope(2);

79+ genericScopeView.isCurrent = true;

79 shell.width = units.gu(120);

80 shell.width = units.gu(120);

80 genericScopeView.categoryView.positionAtBeginning();

81 genericScopeView.categoryView.positionAtBeginning();

81 waitForRendering(genericScopeView.categoryView);

82 waitForRendering(genericScopeView.categoryView);

@@ -116,6 +117,7 @@ Item {

116 }

117 }

117

118

118 function test_isActive() {

119 function test_isActive() {

120+ genericScopeView.isCurrent = false

119 tryCompare(genericScopeView.scope, "isActive", false)

121 tryCompare(genericScopeView.scope, "isActive", false)

120 genericScopeView.isCurrent = true

122 genericScopeView.isCurrent = true

121 tryCompare(genericScopeView.scope, "isActive", true)

123 tryCompare(genericScopeView.scope, "isActive", true)

@@ -140,6 +142,7 @@ Item {

140 }

142 }

141

143

142 function test_searchQuery() {

144 function test_searchQuery() {

145+ genericScopeView.isCurrent = false

143 genericScopeView.scope = scopes.getScope(0);

146 genericScopeView.scope = scopes.getScope(0);

144 genericScopeView.scope.searchQuery = "test";

147 genericScopeView.scope.searchQuery = "test";

145 genericScopeView.scope = scopes.getScope(1);

148 genericScopeView.scope = scopes.getScope(1);

@@ -151,6 +154,7 @@ Item {

151 }

154 }

152

155

153 function test_changeScope() {

156 function test_changeScope() {

157+ genericScopeView.isCurrent = false;

154 genericScopeView.scope.searchQuery = "test"

158 genericScopeView.scope.searchQuery = "test"

155 var originalScopeId = genericScopeView.scope.id;

159 var originalScopeId = genericScopeView.scope.id;

156 genericScopeView.scope = scopes.getScope(originalScopeId + 1)

160 genericScopeView.scope = scopes.getScope(originalScopeId + 1)

@@ -458,6 +462,7 @@ Item {

458 function test_seeAllTwoCategoriesScenario1() {

462 function test_seeAllTwoCategoriesScenario1() {

459 mockScope.setId("mockScope");

463 mockScope.setId("mockScope");

460 mockScope.setName("Mock Scope");

464 mockScope.setName("Mock Scope");

465+ mockScope.isActive = true;

461 mockScope.categories.setCount(2);

466 mockScope.categories.setCount(2);

462 mockScope.categories.resultModel(0).setResultCount(50);

467 mockScope.categories.resultModel(0).setResultCount(50);

463 mockScope.categories.resultModel(1).setResultCount(25);

468 mockScope.categories.resultModel(1).setResultCount(25);

@@ -501,6 +506,7 @@ Item {

501 function test_seeAllTwoCategoriesScenario2() {

506 function test_seeAllTwoCategoriesScenario2() {

502 mockScope.setId("mockScope");

507 mockScope.setId("mockScope");

503 mockScope.setName("Mock Scope");

508 mockScope.setName("Mock Scope");

509+ mockScope.isActive = true;

504 mockScope.categories.setCount(2);

510 mockScope.categories.setCount(2);

505 mockScope.categories.resultModel(0).setResultCount(25);

511 mockScope.categories.resultModel(0).setResultCount(25);

506 mockScope.categories.resultModel(1).setResultCount(50);

512 mockScope.categories.resultModel(1).setResultCount(50);

@@ -601,6 +607,7 @@ Item {

601 var category0 = findChild(categoryListView, "dashCategory0");

607 var category0 = findChild(categoryListView, "dashCategory0");

602 waitForRendering(category0);

608 waitForRendering(category0);

603

609

610+ tryCompareFunction(function() { return category0.item != null; }, true);

604 var cardGrid = category0.item;

611 var cardGrid = category0.item;

605 compare(cardGrid.cardTool.template["non-interactive"], true);

612 compare(cardGrid.cardTool.template["non-interactive"], true);

606

613