diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-18 13:27:39 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-18 13:27:55 +0200 |
commit | 92daac5d8c5e835d6abf2b4222470e07d778f7d4 (patch) | |
tree | 85419db7e126661ff74de7b77b47881831136f5a /tests/auto | |
parent | 83d5e7fc85cc07fb180498876d1a346573f747e7 (diff) | |
parent | a64d954717a4b7fecc8eeea001e4a77483985132 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I06b73dca7aa1ef30f126a64f305dcad546679d4e
Diffstat (limited to 'tests/auto')
-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 7d5c95b4..3e6a82e8 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries.qml @@ -76,7 +76,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); @@ -89,7 +89,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); @@ -101,7 +101,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 01b03827..5016d15e 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml @@ -75,7 +75,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); @@ -88,7 +88,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); @@ -100,7 +100,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 5160975f..74ad1511 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml @@ -75,7 +75,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); @@ -88,7 +88,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); @@ -100,7 +100,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 8e53b42f..15fd4b6e 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml @@ -75,7 +75,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); @@ -88,7 +88,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); @@ -100,7 +100,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 393f631c..ccd133dd 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml @@ -76,7 +76,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); @@ -89,7 +89,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); @@ -101,7 +101,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 b1d3fa27..6a594fde 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml @@ -76,7 +76,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); @@ -89,7 +89,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); @@ -101,7 +101,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, ""); |