diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-09-06 13:56:37 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-09-06 11:17:22 +0000 |
commit | 1474e311738e2676b65c4c40dc7ff0dbf4d6a5bd (patch) | |
tree | 43745410cd6a913a1c3ed0b888dcecaf04d67623 /tests | |
parent | 8ed3130583510feba58e6f289d1c7b5d051a6663 (diff) |
Fix some flaky QML autotests
Category axis test was failing randomly because labels position was
not explicitly initialized.
Pieseries tests failed randomly because Math.random() returned zero
or a value very close to zero, causing the fuzzy compare to not
register the series sum as changed.
Change-Id: Ie7ffa517aad40aaed1282375b35174fb880d5fe6
Reviewed-by: Mika Salmela <mika.salmela@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml-qtquicktest/tst_pieseries.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries.qml b/tests/auto/qml-qtquicktest/tst_pieseries.qml index cbbe567f..25b8ce13 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries.qml @@ -68,7 +68,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(sumChangedSpy.count, count); @@ -81,7 +81,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) pieSeries.remove(pieSeries.at(0)); compare(removedSpy.count, count); @@ -93,7 +93,7 @@ Rectangle { function test_find_and_at() { var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) { compare(pieSeries.find("slice" + j).label, "slice" + j); compare(pieSeries.find("slice" + j).brushFilename, ""); diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml index 8314aced..648c27b0 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml @@ -67,7 +67,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(sumChangedSpy.count, count); @@ -80,7 +80,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) pieSeries.remove(pieSeries.at(0)); compare(removedSpy.count, count); @@ -92,7 +92,7 @@ Rectangle { function test_find() { var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) compare(pieSeries.find("slice" + j).label, "slice" + j); pieSeries.clear(); diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml index 5d7da367..0cbbb0e0 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml @@ -67,7 +67,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(sumChangedSpy.count, count); @@ -80,7 +80,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) pieSeries.remove(pieSeries.at(0)); compare(removedSpy.count, count); @@ -92,7 +92,7 @@ Rectangle { function test_find() { var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) compare(pieSeries.find("slice" + j).label, "slice" + j); pieSeries.clear(); diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml index 5168a095..fb5ae919 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml @@ -67,7 +67,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(sumChangedSpy.count, count); @@ -80,7 +80,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) pieSeries.remove(pieSeries.at(0)); compare(removedSpy.count, count); @@ -92,7 +92,7 @@ Rectangle { function test_find() { var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) compare(pieSeries.find("slice" + j).label, "slice" + j); pieSeries.clear(); diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml index 28cdabe9..fad91491 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml @@ -68,7 +68,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(sumChangedSpy.count, count); @@ -81,7 +81,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) pieSeries.remove(pieSeries.at(0)); compare(removedSpy.count, count); @@ -93,7 +93,7 @@ Rectangle { function test_find_and_at() { var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) { compare(pieSeries.find("slice" + j).label, "slice" + j); compare(pieSeries.find("slice" + j).brushFilename, ""); diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml b/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml index 03a07db5..7aa97282 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml @@ -68,7 +68,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(sumChangedSpy.count, count); @@ -81,7 +81,7 @@ Rectangle { sumChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) pieSeries.remove(pieSeries.at(0)); compare(removedSpy.count, count); @@ -93,7 +93,7 @@ Rectangle { function test_find_and_at() { var count = 50; for (var i = 0; i < count; i++) - pieSeries.append("slice" + i, Math.random()); + pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero for (var j = 0; j < count; j++) { compare(pieSeries.find("slice" + j).label, "slice" + j); compare(pieSeries.find("slice" + j).brushFilename, ""); |