Merge lp:~zeller-benjamin/ubuntu-ui-toolkit/mathutils_dont_warn into lp:ubuntu-ui-toolkit/staging

[Benjamin Zeller]

Fix Bug lp:1520557 "MathUtils.clamp, min value should not be bigger than the max value"

Fix Bug lp:1520557 "MathUtils.clamp, min value should not be bigger than the max value"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1733
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2554/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1282
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1284
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1284/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1281

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1734
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2558/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1288
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1288/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1285

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Niiiiiice.

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/ucmathutils.cpp'
--- src/Ubuntu/Components/plugin/ucmathutils.cpp	2015-11-20 07:29:06 +0000
+++ src/Ubuntu/Components/plugin/ucmathutils.cpp	2015-12-02 11:43:04 +0000
@@ -40,7 +40,6 @@
         return qBound(min, x, max);
     } else {
         // swap min/max if min > max
-        qWarning()<<"MathUtils.clamp, min value should not be bigger than the max value";
         return qBound(max, x, min);
     }
 }

=== modified file 'tests/unit/tst_components/tst_math_utils.qml'
--- tests/unit/tst_components/tst_math_utils.qml	2015-11-20 07:38:55 +0000
+++ tests/unit/tst_components/tst_math_utils.qml	2015-12-02 11:43:04 +0000
@@ -89,8 +89,6 @@
         var maxValue = 9
         var clampValue = -7
 
-        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
-
         var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
         compare(clamped, maxValue, "clamped value not within range")
     }
@@ -100,8 +98,6 @@
         var maxValue = 9
         var clampValue = 111
 
-        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
-
         var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
         compare(clamped, minValue, "clamped value not within range")
     }
@@ -111,8 +107,6 @@
         var maxValue = 9
         var clampValue = 42
 
-        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
-
         var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
         compare(clamped, clampValue, "clamped value changed even though it shouldn't have")
     }
@@ -122,8 +116,6 @@
         var maxValue = 9
         var clampValue = 9
 
-        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
-
         var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
         compare(clamped, clampValue, "clamped value changed even though it shouldn't have")
     }
@@ -133,8 +125,6 @@
         var maxValue = -42
         var clampValue = -50
 
-        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
-
         var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
         compare(clamped, maxValue, "clamped value not within range")
     }
@@ -144,8 +134,6 @@
         var maxValue = -42
         var clampValue = 50
 
-        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
-
         var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
         compare(clamped, minValue, "clamped value not within range")
     }
@@ -155,8 +143,6 @@
         var maxValue = -42
         var clampValue = 50
 
-        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
-
         var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
         compare(clamped, minValue, "clamped value not within range")
     }