@@ -148,14 +148,14 @@ Item {
148148
149149 function test_create_sliderMenu_data() {
150150 return [
151− {label: "testLabel1", enabled: false, minValue: 0, maxValue: 100, value: 10.5 },
152− {label: "testLabel2", enabled: true, minValue: 0, maxValue: 100, value: 100 },
151+ {tag: "disabled", enabled: false, minValue: 0, maxValue: 100, value1: 10.5, value2: 22 },
152+ {tag: "enabled", enabled: true, minValue: 0, maxValue: 100, value1: 100, value2: 50 },
153153 ];
154154 }
155155
156156 function test_create_sliderMenu(data) {
157157 menuData.type = "com.canonical.indicator.slider"
158− menuData.label = data.label;
158+ menuData.label = data.tag;
159159 menuData.sensitive = data.enabled;
160160 menuData.ext = {
161161 'minIcon': "file:///testMinIcon",
@@ -163,20 +163,61 @@ Item {
163163 'minValue': data.minValue,
164164 'maxValue': data.maxValue
165165 };
166− menuData.actionState = data.value;
166+ menuData.actionState = data.value1;
167167
168168 loader.data = menuData;
169169 loader.sourceComponent = factory.load(menuData);
170170 tryCompareFunction(function() { return loader.item != undefined; }, true);
171171 compare(loader.item.objectName, "sliderMenu", "Should have created a slider menu");
172172
173− compare(loader.item.text, data.label, "Label does not match data");
173+ compare(loader.item.text, data.tag, "Label does not match data");
174174 compare(loader.item.minIcon, "file:///testMinIcon", "MinIcon does not match data");
175175 compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
176176 compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
177177 compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");
178− compare(loader.item.value, data.value, "Value does not match data");
179178 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
179+ compare(loader.item.value, data.value1, "Value does not match data");
180+
181+ menuData.actionState = data.value2;
182+ compare(loader.item.value, data.value2, "Value does not match new data");
183+ }
184+
185+ function test_create_sliderMenu_lp1283191_data() {
186+ return [
187+ {tag: "disabled", enabled: false, minValue: 0, maxValue: 100, value1: 10.5, value2: 22, manualValue: 0 },
188+ {tag: "enabled", enabled: true, minValue: 0, maxValue: 100, value1: 100, value2: 50, manualValue: 30 },
189+ {tag: "test-zero", enabled: true, minValue: 0, maxValue: 100, value1: 10, value2: 0, manualValue: 20 },
190+ ];
191+ }
192+
193+ function test_create_sliderMenu_lp1283191(data) {
194+ menuData.type = "com.canonical.indicator.slider"
195+ menuData.label = data.tag;
196+ menuData.sensitive = data.enabled;
197+ menuData.ext = {
198+ 'minIcon': "file:///testMinIcon",
199+ 'maxIcon': "file:///testMaxIcon",
200+ 'minValue': data.minValue,
201+ 'maxValue': data.maxValue
202+ };
203+ menuData.actionState = data.value1;
204+
205+ loader.data = menuData;
206+ loader.sourceComponent = factory.load(menuData);
207+ tryCompareFunction(function() { return loader.item != undefined; }, true);
208+ compare(loader.item.value, data.value1, "Value does not match data");
209+
210+ var slider = findChild(loader.item, "slider");
211+ verify(slider !== null);
212+
213+ slider.value = data.manualValue;
214+ compare(loader.item.value, data.manualValue, "Slider value does not match manual set value");
215+
216+ menuData.actionState = data.value2;
217+ compare(loader.item.value, data.value2, "Value does not match new data");
218+
219+ menuData.actionState = undefined;
220+ compare(loader.item.value, data.value2, "Undefined state should not update slider value");
180221 }
181222
182223 function test_create_buttonMenu_data() {