1 files changed, 34 insertions, 24 deletions

diff --git a/tests/auto/corelib/tools/qline/tst_qline.cpp b/tests/auto/corelib/tools/qline/tst_qline.cpp
index 7e07e9d1e2..f4ac51fc24 100644
--- a/tests/auto/corelib/tools/qline/tst_qline.cpp
+++ b/tests/auto/corelib/tools/qline/tst_qline.cpp
@@ -40,8 +40,6 @@ private slots:
     void testLength();
     void testLength_data();
 
-    void testSetLength();
-
     void testCenter();
     void testCenter_data();
 
@@ -214,11 +212,13 @@ void tst_QLine::testLength_data()
     QTest::addColumn<double>("vx");
     QTest::addColumn<double>("vy");
 
-    QTest::newRow("[1,0]*2") << 0.0 << 0.0 << 1.0 << 0.0 << 1.0 << 2.0 << 2.0 << 0.0;
-    QTest::newRow("[0,1]*2") << 0.0 << 0.0 << 0.0 << 1.0 << 1.0 << 2.0 << 0.0 << 2.0;
-    QTest::newRow("[-1,0]*2") << 0.0 << 0.0 << -1.0 << 0.0 << 1.0 << 2.0 << -2.0 << 0.0;
-    QTest::newRow("[0,-1]*2") << 0.0 << 0.0 << 0.0 << -1.0 << 1.0 << 2.0 << 0.0 << -2.0;
-    QTest::newRow("[1,1]->|1|") << 0.0 << 0.0 << 1.0 << 1.0
+    // Test name: [dx,dy]->|lenToSet| (x1,x2)
+    // with the last part omitted if (0,0)
+    QTest::newRow("[1,0]->|2|") << 0.0 << 0.0 << 1.0 << 0.0 << 1.0 << 2.0 << 2.0 << 0.0;
+    QTest::newRow("[0,1]->|2|") << 0.0 << 0.0 << 0.0 << 1.0 << 1.0 << 2.0 << 0.0 << 2.0;
+    QTest::newRow("[-1,0]->|2|") << 0.0 << 0.0 << -1.0 << 0.0 << 1.0 << 2.0 << -2.0 << 0.0;
+    QTest::newRow("[0,-1]->|2|") << 0.0 << 0.0 << 0.0 << -1.0 << 1.0 << 2.0 << 0.0 << -2.0;
+    QTest::newRow("[1,1]->->|1|") << 0.0 << 0.0 << 1.0 << 1.0
                              << M_SQRT2 << 1.0 << M_SQRT1_2 << M_SQRT1_2;
     QTest::newRow("[-1,1]->|1|") << 0.0 << 0.0 << -1.0 << 1.0
                              << M_SQRT2 << 1.0 << -M_SQRT1_2 << M_SQRT1_2;
@@ -226,10 +226,10 @@ void tst_QLine::testLength_data()
                              << M_SQRT2 << 1.0 << M_SQRT1_2 << -M_SQRT1_2;
     QTest::newRow("[-1,-1]->|1|") << 0.0 << 0.0 << -1.0 << -1.0
                              << M_SQRT2 << 1.0 << -M_SQRT1_2 << -M_SQRT1_2;
-    QTest::newRow("[1,0]*2 (2,2)") << 2.0 << 2.0 << 3.0 << 2.0 << 1.0 << 2.0 << 2.0 << 0.0;
-    QTest::newRow("[0,1]*2 (2,2)") << 2.0 << 2.0 << 2.0 << 3.0 << 1.0 << 2.0 << 0.0 << 2.0;
-    QTest::newRow("[-1,0]*2 (2,2)") << 2.0 << 2.0 << 1.0 << 2.0 << 1.0 << 2.0 << -2.0 << 0.0;
-    QTest::newRow("[0,-1]*2 (2,2)") << 2.0 << 2.0 << 2.0 << 1.0 << 1.0 << 2.0 << 0.0 << -2.0;
+    QTest::newRow("[1,0]->|2| (2,2)") << 2.0 << 2.0 << 3.0 << 2.0 << 1.0 << 2.0 << 2.0 << 0.0;
+    QTest::newRow("[0,1]->|2| (2,2)") << 2.0 << 2.0 << 2.0 << 3.0 << 1.0 << 2.0 << 0.0 << 2.0;
+    QTest::newRow("[-1,0]->|2| (2,2)") << 2.0 << 2.0 << 1.0 << 2.0 << 1.0 << 2.0 << -2.0 << 0.0;
+    QTest::newRow("[0,-1]->|2| (2,2)") << 2.0 << 2.0 << 2.0 << 1.0 << 1.0 << 2.0 << 0.0 << -2.0;
     QTest::newRow("[1,1]->|1| (2,2)") << 2.0 << 2.0 << 3.0 << 3.0
                                    << M_SQRT2 << 1.0 << M_SQRT1_2 << M_SQRT1_2;
     QTest::newRow("[-1,1]->|1| (2,2)") << 2.0 << 2.0 << 1.0 << 3.0
@@ -238,6 +238,20 @@ void tst_QLine::testLength_data()
                                     << M_SQRT2 << 1.0 << M_SQRT1_2 << -M_SQRT1_2;
     QTest::newRow("[-1,-1]->|1| (2,2)") << 2.0 << 2.0 << 1.0 << 1.0
                                      << M_SQRT2 << 1.0 << -M_SQRT1_2 << -M_SQRT1_2;
+    const double small = qSqrt(std::numeric_limits<qreal>::denorm_min()) / 8;
+    QTest::newRow("[small,small]->|2| (-small/2,-small/2)")
+        << -(small * .5) << -(small * .5) << (small * .5) << (small * .5)
+        << (small * M_SQRT2) << (2 * M_SQRT2) << 2.0 << 2.0;
+    const double tiny = std::numeric_limits<qreal>::min() / 2;
+    QTest::newRow("[tiny,tiny]->|2| (-tiny/2,-tiny/2)")
+        << -(tiny * .5) << -(tiny * .5) << (tiny * .5) << (tiny * .5)
+        << (tiny * M_SQRT2) << (2 * M_SQRT2) << 2.0 << 2.0;
+    QTest::newRow("[1+3e-13,1+4e-13]|1895| (1, 1)")
+        << 1.0 << 1.0 << (1 + 3e-13) << (1 + 4e-13) // isNull(), so ignores setLength()
+        << 5e-13 << 1895.0 << 3e-13 << 4e-13;
+    QTest::newRow("[4e-323,5e-324]|1892|") // Unavoidable underflow: denormals
+        << 0.0 << 0.0 << 4e-323 << 5e-324
+        << 4e-323 << 1892.0 << 4e-323 << 5e-324; // vx, vy values ignored
 }
 
 void tst_QLine::testLength()
@@ -252,21 +266,17 @@ void tst_QLine::testLength()
     QFETCH(double, vy);
 
     QLineF l(x1, y1, x2, y2);
-    QCOMPARE(l.length(), qreal(length));
+    const bool wasNull = l.isNull();
+    if (!wasNull)
+        QCOMPARE(l.length(), qreal(length));
 
     l.setLength(lengthToSet);
-    QCOMPARE(l.length(), qreal(lengthToSet));
-    QCOMPARE(l.dx(), qreal(vx));
-    QCOMPARE(l.dy(), qreal(vy));
-}
-
-void tst_QLine::testSetLength()
-{
-    QLineF l(0, 0, 4e-323, 5e-324);
-    const qreal newLength = 1892;
-    const qreal oldLength = l.length();
-    l.setLength(newLength);
-    QCOMPARE(l.length(), oldLength ? newLength : 0);
+    QCOMPARE(l.length(), wasNull ? qreal(length) : qreal(lengthToSet));
+    // Scaling tiny values up to big can be imprecise: don't try to test vx, vy
+    if (wasNull || !qFuzzyIsNull(length)) {
+        QCOMPARE(l.dx(), qreal(vx));
+        QCOMPARE(l.dy(), qreal(vy));
+    }
 }
 
 void tst_QLine::testCenter()