| @@ -597,7 +597,6 void tst_Domain::zoom() | |||||
| 597 | TRY_COMPARE(spy0.count(), 6); |
|
597 | TRY_COMPARE(spy0.count(), 6); | |
| 598 | TRY_COMPARE(spy1.count(), 6); |
|
598 | TRY_COMPARE(spy1.count(), 6); | |
| 599 | TRY_COMPARE(spy2.count(), 6); |
|
599 | TRY_COMPARE(spy2.count(), 6); | |
| 600 |
|
||||
| 601 | } |
|
600 | } | |
| 602 |
|
601 | |||
| 603 | void tst_Domain::move_data() |
|
602 | void tst_Domain::move_data() | |
| @@ -633,8 +632,8 void tst_Domain::move() | |||||
| 633 |
|
632 | |||
| 634 | QCOMPARE(domain == result, true); |
|
633 | QCOMPARE(domain == result, true); | |
| 635 | TRY_COMPARE(spy0.count(), 1); |
|
634 | TRY_COMPARE(spy0.count(), 1); | |
| 636 | TRY_COMPARE(spy1.count(), dx!=0?1:0); |
|
635 | TRY_COMPARE(spy1.count(), (dx != 0 ? 1 : 0)); | |
| 637 | TRY_COMPARE(spy2.count(), dy!=0?1:0); |
|
636 | TRY_COMPARE(spy2.count(), (dy != 0 ? 1 : 0)); | |
| 638 | } |
|
637 | } | |
| 639 |
|
638 | |||
| 640 | void tst_Domain::handleAxisXChanged_data() |
|
639 | void tst_Domain::handleAxisXChanged_data() | |
| @@ -29,7 +29,7 | |||||
| 29 | const int waitStep(30); \ |
|
29 | const int waitStep(30); \ | |
| 30 | /* always wait before comparing to catch possible extra signals */ \ |
|
30 | /* always wait before comparing to catch possible extra signals */ \ | |
| 31 | QTest::qWait(waitStep); \ |
|
31 | QTest::qWait(waitStep); \ | |
| 32 | for (int time(0); actual != expected && time < timeout; time += waitStep) \ |
|
32 | for (int time(0); (actual != expected) && (time < timeout); time += waitStep) \ | |
| 33 | QTest::qWait(waitStep); \ |
|
33 | QTest::qWait(waitStep); \ | |
| 34 | QCOMPARE(actual, expected); \ |
|
34 | QCOMPARE(actual, expected); \ | |
| 35 | } while (0); \ |
|
35 | } while (0); \ | |
General Comments 0
You need to be logged in to leave comments.
Login now