Merge lp:~zsombi/ubuntu-ui-toolkit/label-fontsize-fix into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Fixing typo in the Label test case. Refactoring tests to use data driven test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1327
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1225/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6556/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1057
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1057/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/1057
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6131/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7808
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15889

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1225/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Nice clean-up!!!! And good job spotting the silly typo :-d

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/unit/tst_components/tst_label.qml'
--- tests/unit/tst_components/tst_label.qml	2014-10-08 09:57:38 +0000
+++ tests/unit/tst_components/tst_label.qml	2014-11-17 13:31:22 +0000
@@ -21,39 +21,44 @@
 TestCase {
     name: "LabelAPI"
 
+    function cleanup() {
+        textCustom.fontSize = "medium";
+        textCustom.font.weight = Font.Light;
+    }
+
     function test_0_defaults() {
         compare(textCustom.font.family, "Ubuntu", "Default font family");
         compare(textCustom.font.weight, Font.Light, "Default font weight");
-    }
-
-    function test_fontSize() {
         compare(textCustom.fontSize,"medium","fontSize is 'medium' by default")
-
-        var fontSizes = ["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large" ]
-
-        for (var i=0;i<fontSizes.length;i++)
-        {
-
-            var newFontSize = fontSizes[i]
-            textCustom.fontSize = newFontSize
-            if (newFontSize == 'xx-small')
-                expectFail("","https://bugs.launchpad.net/tavastia/+bug/1076771")
-            compare(textCustom.newFontSize, newFontSize, "Can set/get " + newFontSize)
-        }
-    }
-
-    function test_fontWeight() {
-        compare(textCustom.font.weight, Font.Light, "font.weight is 'light' by default")
-
-        var fontWeights = [ Font.Light, Font.Normal, Font.DemiBold, Font.Bold, Font.Black ]
-
-        for (var i in fontWeights)
-        {
-            var newFontWeight = fontWeights[i]
-            textCustom.font.weight = newFontWeight
-
-            compare(textCustom.font.weight, newFontWeight, "can set/get " + newFontWeight)
-        }
+    }
+
+    function test_fontSize_data() {
+        return [
+            {tag: "xx-small"},
+            {tag: "x-small"},
+            {tag: "small"},
+            {tag: "medium"},
+            {tag: "large"},
+            {tag: "x-large"},
+        ];
+    }
+    function test_fontSize(data) {
+        textCustom.fontSize = data.tag;
+        compare(textCustom.fontSize, data.tag, "Can set/get " + data.tag)
+    }
+
+    function test_fontWeight_data() {
+        return [
+            {tag: "Light", weight: Font.Light},
+            {tag: "Normal", weight: Font.Normal},
+            {tag: "DemiBold", weight: Font.DemiBold},
+            {tag: "Bold", weight: Font.Bold},
+            {tag: "Black", weight: Font.Black},
+        ];
+    }
+    function test_fontWeight(data) {
+        textCustom.font.weight = data.weight
+        compare(textCustom.font.weight, data.weight, "can set/get " + data.weight);
     }
 
     function test_boldWeightConflict() {