ed9f1a6 · unity8 · git.iko.soy

git.iko.soy/unity8

Forgot to rename some variables.

commited9f1a6066f0cf81ce3ed191c949f8cd0a0f12a5 authorPawel Stolowski <pawel.stolowski@canonical.com> dateThu 13 Jun 2013, 15:15 (13 years ago) parent4c95d0c

2 files changed+28−28

compare with xenial

unifiedsplit

tests/qmltests/Dash/qml/FakeScopeView.qml+4−4 tests/qmltests/Dash/tst_DashContent.qml+24−24

tests/qmltests/Dash/qml/FakeScopeView.qml+4−4

@@ -31,13 +31,13 @@ FocusScope {

3131 property alias backColor : back.color

3232

3333 onEndReached: {

34− if (shell != undefined && shell.scope_status != undefined) {

35− shell.scope_status[scope.id].endReached++;

34+ if (shell != undefined && shell.scopeStatus != undefined) {

35+ shell.scopeStatus[scope.id].endReached++;

3636 }

3737 }

3838 onMovementStarted: {

39− if (shell != undefined && shell.scope_status != undefined) {

40− shell.scope_status[scope.id].movementStarted++;

39+ if (shell != undefined && shell.scopeStatus != undefined) {

40+ shell.scopeStatus[scope.id].movementStarted++;

4141 }

4242 }

4343 onPositionedAtBeginning: {

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

@@ -62,20 +62,20 @@ Item {

6262 }

6363

6464 function clear_scope_status() {

65− scope_status["MockScope1"].movementStarted = 0;

66− scope_status["MockScope1"].positionedAtBeginning = 0;

65+ scopeStatus["MockScope1"].movementStarted = 0;

66+ scopeStatus["MockScope1"].positionedAtBeginning = 0;

6767

68− scope_status["MockScope2"].movementStarted = 0;

69− scope_status["MockScope2"].positionedAtBeginning = 0;

68+ scopeStatus["MockScope2"].movementStarted = 0;

69+ scopeStatus["MockScope2"].positionedAtBeginning = 0;

7070

71− scope_status["MockScope3"].movementStarted = 0;

72− scope_status["MockScope3"].positionedAtBeginning = 0;

71+ scopeStatus["MockScope3"].movementStarted = 0;

72+ scopeStatus["MockScope3"].positionedAtBeginning = 0;

7373

74− scope_status["MockScope4"].movementStarted = 0;

75− scope_status["MockScope4"].positionedAtBeginning = 0;

74+ scopeStatus["MockScope4"].movementStarted = 0;

75+ scopeStatus["MockScope4"].positionedAtBeginning = 0;

7676

77− scope_status["MockScope5"].movementStarted = 0;

78− scope_status["MockScope5"].positionedAtBeginning = 0;

77+ scopeStatus["MockScope5"].movementStarted = 0;

78+ scopeStatus["MockScope5"].positionedAtBeginning = 0;

7979 }

8080

8181 SignalSpy {

@@ -115,7 +115,7 @@ Item {

115115 }

116116

117117 function test_movement_started_signal() {

118− dash_content.setCurrentScopeAtIndex(3, true, false);

118+ dashContent.setCurrentScopeAtIndex(3, true, false);

119119

120120 var dashContentList = findChild(dashContent, "dashContentList");

121121 verify(dashContentList != undefined)

@@ -125,24 +125,24 @@ Item {

125125 dashContentList.movementStarted();

126126

127127 compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");

128− compare(scope_status["MockScope1"].movementStarted, 1, "MockScope1 should have emitted movementStarted signal when content list did.");

129− compare(scope_status["MockScope2"].movementStarted, 1, "MockScope2 should have emitted movementStarted signal when content list did.");

130− compare(scope_status["MockScope3"].movementStarted, 1, "MockScope3 should have emitted movementStarted signal when content list did.");

131− compare(scope_status["MockScope4"].movementStarted, 1, "MockScope4 should have emitted movementStarted signal when content list did.");

132− compare(scope_status["MockScope5"].movementStarted, 1, "MockScope5 should have emitted movementStarted signal when content list did.");

128+ compare(scopeStatus["MockScope1"].movementStarted, 1, "MockScope1 should have emitted movementStarted signal when content list did.");

129+ compare(scopeStatus["MockScope2"].movementStarted, 1, "MockScope2 should have emitted movementStarted signal when content list did.");

130+ compare(scopeStatus["MockScope3"].movementStarted, 1, "MockScope3 should have emitted movementStarted signal when content list did.");

131+ compare(scopeStatus["MockScope4"].movementStarted, 1, "MockScope4 should have emitted movementStarted signal when content list did.");

132+ compare(scopeStatus["MockScope5"].movementStarted, 1, "MockScope5 should have emitted movementStarted signal when content list did.");

133133 }

134134

135135 function test_positioned_at_beginning_signal() {

136− dash_content.setCurrentScopeAtIndex(3, true, false);

136+ dashContent.setCurrentScopeAtIndex(3, true, false);

137137

138138 tryCompare(scopeLoadedSpy, "count", 5);

139139

140− dash_content.positionedAtBeginning();

141− compare(scope_status["MockScope1"].positionedAtBeginning, 1, "MockScope1 should have emitted positionedAtBeginning signal when DashContent did.");

142− compare(scope_status["MockScope2"].positionedAtBeginning, 1, "MockScope2 should have emitted positionedAtBeginning signal when DashContent did.");

143− compare(scope_status["MockScope3"].positionedAtBeginning, 1, "MockScope3 should have emitted positionedAtBeginning signal when DashContent did.");

144− compare(scope_status["MockScope4"].positionedAtBeginning, 1, "MockScope4 should have emitted positionedAtBeginning signal when DashContent did.");

145− compare(scope_status["MockScope5"].positionedAtBeginning, 1, "MockScope5 should have emitted positionedAtBeginning signal when DashContent did.");

140+ dashContent.positionedAtBeginning();

141+ compare(scopeStatus["MockScope1"].positionedAtBeginning, 1, "MockScope1 should have emitted positionedAtBeginning signal when DashContent did.");

142+ compare(scopeStatus["MockScope2"].positionedAtBeginning, 1, "MockScope2 should have emitted positionedAtBeginning signal when DashContent did.");

143+ compare(scopeStatus["MockScope3"].positionedAtBeginning, 1, "MockScope3 should have emitted positionedAtBeginning signal when DashContent did.");

144+ compare(scopeStatus["MockScope4"].positionedAtBeginning, 1, "MockScope4 should have emitted positionedAtBeginning signal when DashContent did.");

145+ compare(scopeStatus["MockScope5"].positionedAtBeginning, 1, "MockScope5 should have emitted positionedAtBeginning signal when DashContent did.");

146146 }

147147

148148 function test_scope_loaded() {

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

154154 verify(dashContentList != undefined);

155155

156156 tryCompare(scopeLoadedSpy, "count", 5);

157− dash_content.setCurrentScopeAtIndex(0, true, false);

157+ dashContent.setCurrentScopeAtIndex(0, true, false);

158158 dashContentList.currentItem.item.endReached();

159159

160160 compare(contentEndReachedSpy.count, 1);