1
=== modified file 'src/Ubuntu/Components/plugin/ucmathutils.cpp'
2
--- src/Ubuntu/Components/plugin/ucmathutils.cpp	2015-11-20 07:29:06 +0000
3
+++ src/Ubuntu/Components/plugin/ucmathutils.cpp	2015-12-02 11:43:04 +0000
4
@@ -40,7 +40,6 @@
5
40
        return qBound(min, x, max);
40
        return qBound(min, x, max);
6
41
    } else {
41
    } else {
7
42
        // swap min/max if min > max
42
        // swap min/max if min > max
8
43
        qWarning()<<"MathUtils.clamp, min value should not be bigger than the max value";
9
44
        return qBound(max, x, min);
43
        return qBound(max, x, min);
10
45
    }
44
    }
11
46
}
45
}
12
47
46
13
=== modified file 'tests/unit/tst_components/tst_math_utils.qml'
14
--- tests/unit/tst_components/tst_math_utils.qml	2015-11-20 07:38:55 +0000
15
+++ tests/unit/tst_components/tst_math_utils.qml	2015-12-02 11:43:04 +0000
16
@@ -89,8 +89,6 @@
17
89
        var maxValue = 9
89
        var maxValue = 9
18
90
        var clampValue = -7
90
        var clampValue = -7
19
91
91
20
92
        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
21
93
22
94
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
92
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
23
95
        compare(clamped, maxValue, "clamped value not within range")
93
        compare(clamped, maxValue, "clamped value not within range")
24
96
    }
94
    }
25
@@ -100,8 +98,6 @@
26
100
        var maxValue = 9
98
        var maxValue = 9
27
101
        var clampValue = 111
99
        var clampValue = 111
28
102
100
29
103
        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
30
104
31
105
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
101
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
32
106
        compare(clamped, minValue, "clamped value not within range")
102
        compare(clamped, minValue, "clamped value not within range")
33
107
    }
103
    }
34
@@ -111,8 +107,6 @@
35
111
        var maxValue = 9
107
        var maxValue = 9
36
112
        var clampValue = 42
108
        var clampValue = 42
37
113
109
38
114
        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
39
115
40
116
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
110
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
41
117
        compare(clamped, clampValue, "clamped value changed even though it shouldn't have")
111
        compare(clamped, clampValue, "clamped value changed even though it shouldn't have")
42
118
    }
112
    }
43
@@ -122,8 +116,6 @@
44
122
        var maxValue = 9
116
        var maxValue = 9
45
123
        var clampValue = 9
117
        var clampValue = 9
46
124
118
47
125
        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
48
126
49
127
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
119
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
50
128
        compare(clamped, clampValue, "clamped value changed even though it shouldn't have")
120
        compare(clamped, clampValue, "clamped value changed even though it shouldn't have")
51
129
    }
121
    }
52
@@ -133,8 +125,6 @@
53
133
        var maxValue = -42
125
        var maxValue = -42
54
134
        var clampValue = -50
126
        var clampValue = -50
55
135
127
56
136
        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
57
137
58
138
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
128
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
59
139
        compare(clamped, maxValue, "clamped value not within range")
129
        compare(clamped, maxValue, "clamped value not within range")
60
140
    }
130
    }
61
@@ -144,8 +134,6 @@
62
144
        var maxValue = -42
134
        var maxValue = -42
63
145
        var clampValue = 50
135
        var clampValue = 50
64
146
136
65
147
        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
66
148
67
149
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
137
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
68
150
        compare(clamped, minValue, "clamped value not within range")
138
        compare(clamped, minValue, "clamped value not within range")
69
151
    }
139
    }
70
@@ -155,8 +143,6 @@
71
155
        var maxValue = -42
143
        var maxValue = -42
72
156
        var clampValue = 50
144
        var clampValue = 50
73
157
145
74
158
        ignoreWarning("MathUtils.clamp, min value should not be bigger than the max value")
75
159
76
160
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
146
        var clamped = MathUtils.clamp(clampValue, minValue, maxValue)
77
161
        compare(clamped, minValue, "clamped value not within range")
147
        compare(clamped, minValue, "clamped value not within range")
78
162
    }
148
    }
Reviewer	Review Type	Date Requested	Status
Cris Dywan		2015-12-02	Approve on 2015-12-03
PS Jenkins bot	continuous-integration		Approve on 2015-12-02
Review via email: mp+279243@code.launchpad.net