5ab40fb · unity8 · git.iko.soy

git.iko.soy/unity8

fixed qmltests

commit5ab40fbe54a15717cad922189515f58f65a92ddb authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 24 Jul 2013, 12:52 (13 years ago) parent3f11c57

4 files changed+27−24

compare with xenial

unifiedsplit

Panel/IndicatorRow.qml+3 tests/qmltests/Panel/tst_IndicatorRow.qml+19−19 tests/qmltests/Panel/tst_MenuContent.qml+4−4 tests/qmltests/Panel/tst_Panel.qml+1−1

Panel/IndicatorRow.qml+3

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

5858 id: itemWrapper

5959 height: indicatorRow.height

6060 width: childrenRect.width

61+

6162 property int ownIndex: index

63+ property alias highlighted: indicatorItem.highlighted

64+ property alias dimmed: indicatorItem.dimmed

6265

6366 IndicatorItem {

6467 id: indicatorItem

tests/qmltests/Panel/tst_IndicatorRow.qml+19−19

@@ -61,13 +61,13 @@ Item {

6161

6262 function test_set_current_item() {

6363 init_test();

64− indicatorRow.setItem(0);

64+ indicatorRow.setCurrentItem(0);

6565 compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu1", "Incorrect item at position 0");

6666

67− indicatorRow.setItem(1);

67+ indicatorRow.setCurrentItem(1);

6868 compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu2", "Incorrect item at position 1");

6969

70− indicatorRow.setItem(2);

70+ indicatorRow.setCurrentItem(2);

7171 compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu3", "Incorrect item at position 2");

7272 }

7373 }

@@ -83,13 +83,13 @@ Item {

8383 function test_current_item_commit() {

8484 init_test();

8585

86− indicatorRow.setItem(1);

86+ indicatorRow.setCurrentItem(1);

8787 indicatorRow.state = "commit";

88− tryCompare(get_indicator_item_at(0), "y", -indicatorRow.height);

89− tryCompare(get_indicator_item_at(1), "y", 0);

90− tryCompare(get_indicator_item_at(2), "y", -indicatorRow.height);

91− tryCompare(get_indicator_item_at(3), "y", -indicatorRow.height);

92− tryCompare(get_indicator_item_at(4), "y", -indicatorRow.height);

88+ tryCompare(get_indicator_item_at(0), "opacity", 0.0);

89+ tryCompare(get_indicator_item_at(1), "opacity", 1.0);

90+ tryCompare(get_indicator_item_at(2), "opacity", 0.0);

91+ tryCompare(get_indicator_item_at(3), "opacity", 0.0);

92+ tryCompare(get_indicator_item_at(4), "opacity", 0.0);

9393

9494 }

9595 }

@@ -106,7 +106,7 @@ Item {

106106 init_test();

107107

108108 indicatorRow.state = "initial";

109− indicatorRow.setItem(0);

109+ indicatorRow.setCurrentItem(0);

110110

111111 compare(indicatorRow.currentItem.highlighted, false, "Indicator should not highlight when in initial state");

112112 compare(get_indicator_item_at(1).highlighted, false, "Other indicators should not highlight when in initial state");

@@ -119,7 +119,7 @@ Item {

119119 init_test();

120120

121121 indicatorRow.state = "hint";

122− indicatorRow.setItem(0);

122+ indicatorRow.setCurrentItem(0);

123123

124124 compare(indicatorRow.currentItem.highlighted, true, "Indicator should highlight when in hint state");

125125 compare(get_indicator_item_at(1).highlighted, false, "Other indicators should not highlight when in hint state");

@@ -132,7 +132,7 @@ Item {

132132 init_test();

133133

134134 indicatorRow.state = "reveal";

135− indicatorRow.setItem(0);

135+ indicatorRow.setCurrentItem(0);

136136

137137 compare(indicatorRow.currentItem.highlighted, true, "Indicator should highlight when in reveal state");

138138 compare(get_indicator_item_at(1).highlighted, false, "Other indicators should not highlight when in commit state");

@@ -145,7 +145,7 @@ Item {

145145 init_test();

146146

147147 indicatorRow.state = "commit";

148− indicatorRow.setItem(0);

148+ indicatorRow.setCurrentItem(0);

149149

150150 compare(indicatorRow.currentItem.highlighted, true, "Indicator should highlight when in commit state");

151151 compare(get_indicator_item_at(1).highlighted, false, "Other indicators should not highlight when in commit state");

@@ -158,7 +158,7 @@ Item {

158158 init_test();

159159

160160 indicatorRow.state = "locked";

161− indicatorRow.setItem(0);

161+ indicatorRow.setCurrentItem(0);

162162

163163 compare(indicatorRow.currentItem.highlighted, true, "Indicator should highlight when in locked state");

164164 compare(get_indicator_item_at(1).highlighted, false, "Other indicators should not highlight when in locked state");

@@ -180,7 +180,7 @@ Item {

180180 init_test();

181181

182182 indicatorRow.state = "initial";

183− indicatorRow.setItem(0);

183+ indicatorRow.setCurrentItem(0);

184184

185185 compare(get_indicator_item_at(0).dimmed, false, "Current indicator should not dim when in intiial state");

186186 compare(get_indicator_item_at(1).dimmed, false, "Other indicators should not dim when in initial state");

@@ -193,7 +193,7 @@ Item {

193193 init_test();

194194

195195 indicatorRow.state = "hint";

196− indicatorRow.setItem(0);

196+ indicatorRow.setCurrentItem(0);

197197

198198 compare(get_indicator_item_at(0).dimmed, false, "Current indicator should not dim when in hint state");

199199 compare(get_indicator_item_at(1).dimmed, true, "Other indicators should dim when in hint state");

@@ -206,7 +206,7 @@ Item {

206206 init_test();

207207

208208 indicatorRow.state = "reveal";

209− indicatorRow.setItem(0);

209+ indicatorRow.setCurrentItem(0);

210210

211211 compare(get_indicator_item_at(0).dimmed, false, "Current indicator should not dim when in reveal state");

212212 compare(get_indicator_item_at(1).dimmed, true, "Other indicators should dim when in reveal state");

@@ -219,7 +219,7 @@ Item {

219219 init_test();

220220

221221 indicatorRow.state = "commit";

222− indicatorRow.setItem(0);

222+ indicatorRow.setCurrentItem(0);

223223

224224 compare(get_indicator_item_at(0).dimmed, false, "Current indicator should not dim when in commit state");

225225 compare(get_indicator_item_at(1).dimmed, true, "Other indicators should dim when in commit state");

@@ -232,7 +232,7 @@ Item {

232232 init_test();

233233

234234 indicatorRow.state = "locked";

235− indicatorRow.setItem(0);

235+ indicatorRow.setCurrentItem(0);

236236

237237 compare(get_indicator_item_at(0).dimmed, false, "Current indicator should not dim when in locked state");

238238 compare(get_indicator_item_at(1).dimmed, true, "Other indicators should dim when in locked state");

tests/qmltests/Panel/tst_MenuContent.qml+4−4

@@ -77,15 +77,15 @@ Item {

7777

7878 function activate_next_content()

7979 {

80− if (menuContent.currentIndex == -1)

80+ if (menuContent.currentMenuIndex == -1)

8181 activate_content(0);

8282 else

83− activate_content((menuContent.currentIndex + 1) % indicatorsModel.count)

83+ activate_content((menuContent.currentMenuIndex + 1) % indicatorsModel.count)

8484 }

8585

8686 function activate_content(index)

8787 {

88− menuContent.currentIndex = index

88+ menuContent.currentMenuIndex = index

8989 }

9090

9191 function get_test_menu_objecName(index) {

@@ -197,7 +197,7 @@ Item {

197197

198198 for (var i = 0; i < 100; i++) {

199199 activate_content(i % menu_count);

200− compare(menuContent.currentIndex, i%menu_count);

200+ compare(menuContent.currentMenuIndex, i%menu_count);

201201 }

202202 wait(100);

203203 }

tests/qmltests/Panel/tst_Panel.qml+1−1

@@ -181,7 +181,7 @@ Item {

181181

182182 compare(indicator_row.currentItem, indicator_item,

183183 "Incorrect item activated at position " + i);

184− compare(menu_content.currentIndex, i, "Menu conetent should be enabled for item at position " + i);

184+ compare(menu_content.currentMenuIndex, i, "Menu conetent should be enabled for item at position " + i);

185185

186186 // init for next indicator_item

187187 init();