From f5890e07ca8172b05ce8305c65b42531acdb629b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 4 Apr 2017 15:32:23 +0200 Subject: auto tests: utilize TestCase::fuzzyCompare() Change-Id: I9c3f7997a14bd1824663c7521061c4ee43d6380e Reviewed-by: Mitch Curtis --- tests/auto/controls/data/tst_rangeslider.qml | 24 ++++++++++-------------- tests/auto/controls/data/tst_slider.qml | 24 ++++++++++-------------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml index cde81981..c25b7e0f 100644 --- a/tests/auto/controls/data/tst_rangeslider.qml +++ b/tests/auto/controls/data/tst_rangeslider.qml @@ -792,9 +792,7 @@ TestCase { control.first.value = 0 control.second.value = data.to - function sliderCompare(left, right) { - return Math.abs(left - right) < 0.05 - } + var fuzz = 0.05 mousePress(control, control.first.handle.x, control.first.handle.y) compare(control.first.pressed, true) @@ -803,13 +801,13 @@ TestCase { mouseMove(control, control.leftPadding + 0.15 * (control.availableWidth + control.first.handle.width / 2)) compare(control.first.pressed, true) - verify(sliderCompare(control.first.value, data.values[1])) - verify(sliderCompare(control.first.position, data.positions[1])) + fuzzyCompare(control.first.value, data.values[1], fuzz) + fuzzyCompare(control.first.position, data.positions[1], fuzz) mouseRelease(control, control.leftPadding + 0.15 * (control.availableWidth + control.first.handle.width / 2)) compare(control.first.pressed, false) - verify(sliderCompare(control.first.value, data.values[2])) - verify(sliderCompare(control.first.position, data.positions[2])) + fuzzyCompare(control.first.value, data.values[2], fuzz) + fuzzyCompare(control.first.position, data.positions[2], fuzz) } function test_snapMode_touch_data() { @@ -823,9 +821,7 @@ TestCase { control.first.value = 0 control.second.value = data.to - function sliderCompare(left, right) { - return Math.abs(left - right) < 0.05 - } + var fuzz = 0.05 var touch = touchEvent(control) touch.press(0, control, control.first.handle.x, control.first.handle.y).commit() @@ -835,13 +831,13 @@ TestCase { touch.move(0, control, control.leftPadding + 0.15 * (control.availableWidth + control.first.handle.width / 2)).commit() compare(control.first.pressed, true) - verify(sliderCompare(control.first.value, data.values[1])) - verify(sliderCompare(control.first.position, data.positions[1])) + fuzzyCompare(control.first.value, data.values[1], fuzz) + fuzzyCompare(control.first.position, data.positions[1], fuzz) touch.release(0, control, control.leftPadding + 0.15 * (control.availableWidth + control.first.handle.width / 2)).commit() compare(control.first.pressed, false) - verify(sliderCompare(control.first.value, data.values[2])) - verify(sliderCompare(control.first.position, data.positions[2])) + fuzzyCompare(control.first.value, data.values[2], fuzz) + fuzzyCompare(control.first.position, data.positions[2], fuzz) } function test_focus() { diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index c647b666..40bb389d 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -664,9 +664,7 @@ TestCase { var control = createTemporaryObject(slider, testCase, {live: false, snapMode: data.snapMode, from: data.from, to: data.to, stepSize: 0.2}) verify(control) - function sliderCompare(left, right) { - return Math.abs(left - right) < 0.05 - } + var fuzz = 0.05 mousePress(control, control.leftPadding) compare(control.value, data.values[0]) @@ -674,12 +672,12 @@ TestCase { mouseMove(control, control.leftPadding + 0.15 * (control.availableWidth + control.handle.width / 2)) - verify(sliderCompare(control.value, data.values[1])) - verify(sliderCompare(control.position, data.positions[1])) + fuzzyCompare(control.value, data.values[1], fuzz) + fuzzyCompare(control.position, data.positions[1], fuzz) mouseRelease(control, control.leftPadding + 0.15 * (control.availableWidth + control.handle.width / 2)) - verify(sliderCompare(control.value, data.values[2])) - verify(sliderCompare(control.position, data.positions[2])) + fuzzyCompare(control.value, data.values[2], fuzz) + fuzzyCompare(control.position, data.positions[2], fuzz) } function test_snapMode_touch_data() { @@ -690,9 +688,7 @@ TestCase { var control = createTemporaryObject(slider, testCase, {live: false, snapMode: data.snapMode, from: data.from, to: data.to, stepSize: 0.2}) verify(control) - function sliderCompare(left, right) { - return Math.abs(left - right) < 0.05 - } + var fuzz = 0.05 var touch = touchEvent(control) touch.press(0, control, control.leftPadding).commit() @@ -701,12 +697,12 @@ TestCase { touch.move(0, control, control.leftPadding + 0.15 * (control.availableWidth + control.handle.width / 2)).commit() - verify(sliderCompare(control.value, data.values[1])) - verify(sliderCompare(control.position, data.positions[1])) + fuzzyCompare(control.value, data.values[1], fuzz) + fuzzyCompare(control.position, data.positions[1], fuzz) touch.release(0, control, control.leftPadding + 0.15 * (control.availableWidth + control.handle.width / 2)).commit() - verify(sliderCompare(control.value, data.values[2])) - verify(sliderCompare(control.position, data.positions[2])) + fuzzyCompare(control.value, data.values[2], fuzz) + fuzzyCompare(control.position, data.positions[2], fuzz) } function test_wheel_data() { -- cgit v1.2.3