diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 15:32:04 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 17:05:01 +0200 |
commit | e4e4bb78b769c80bba6391636442e74aa9ed7772 (patch) | |
tree | f1c5a81dd222cc0a53e0c59f01ae5e43cfb22816 /tests/auto/corelib/tools | |
parent | 42b5c28db510bd5facef34267f7fd66a57793030 (diff) |
tst_QLine: use qmath.h's constants instead of local versions
Change-Id: I41313f7e7caf3c364ae900a0b100c661aafb290d
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'tests/auto/corelib/tools')
-rw-r--r-- | tests/auto/corelib/tools/qline/tst_qline.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/tests/auto/corelib/tools/qline/tst_qline.cpp b/tests/auto/corelib/tools/qline/tst_qline.cpp index 31aa5b4e0c..2707dea146 100644 --- a/tests/auto/corelib/tools/qline/tst_qline.cpp +++ b/tests/auto/corelib/tools/qline/tst_qline.cpp @@ -28,7 +28,7 @@ #include <QtTest/QtTest> #include <qline.h> -#include <math.h> +#include <qmath.h> #ifndef M_2PI #define M_2PI 6.28318530717958647692528676655900576 @@ -69,12 +69,6 @@ private slots: void testSet(); }; -// Square root of two -#define SQRT2 1.4142135623731 - -// Length of unit vector projected to x from 45 degrees -#define UNITX_45 0.707106781186547 - const qreal epsilon = sizeof(qreal) == sizeof(double) ? 1e-8 : 1e-4; void tst_QLine::testSet() @@ -235,25 +229,25 @@ void tst_QLine::testLength_data() 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 - << double(SQRT2) << 1.0 << double(UNITX_45) << double(UNITX_45); + << M_SQRT2 << 1.0 << M_SQRT1_2 << M_SQRT1_2; QTest::newRow("[-1,1]->|1|") << 0.0 << 0.0 << -1.0 << 1.0 - << double(SQRT2) << 1.0 << double(-UNITX_45) << double(UNITX_45); + << M_SQRT2 << 1.0 << -M_SQRT1_2 << M_SQRT1_2; QTest::newRow("[1,-1]->|1|") << 0.0 << 0.0 << 1.0 << -1.0 - << double(SQRT2) << 1.0 << double(UNITX_45) << double(-UNITX_45); + << M_SQRT2 << 1.0 << M_SQRT1_2 << -M_SQRT1_2; QTest::newRow("[-1,-1]->|1|") << 0.0 << 0.0 << -1.0 << -1.0 - << double(SQRT2) << 1.0 << double(-UNITX_45) << double(-UNITX_45); + << 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,1]->|1| (2,2)") << 2.0 << 2.0 << 3.0 << 3.0 - << double(SQRT2) << 1.0 << double(UNITX_45) << double(UNITX_45); + << 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 - << double(SQRT2) << 1.0 << double(-UNITX_45) << double(UNITX_45); + << M_SQRT2 << 1.0 << -M_SQRT1_2 << M_SQRT1_2; QTest::newRow("[1,-1]->|1| (2,2)") << 2.0 << 2.0 << 3.0 << 1.0 - << double(SQRT2) << 1.0 << double(UNITX_45) << double(-UNITX_45); + << 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 - << double(SQRT2) << 1.0 << double(-UNITX_45) << double(-UNITX_45); + << M_SQRT2 << 1.0 << -M_SQRT1_2 << -M_SQRT1_2; } void tst_QLine::testLength() |