##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Adds niceNmber test case to tst_domain
Michal Klocek -
r773:621cf63ac719
parent child
Show More
Show file before | Show file after | Hide comments
@@ -47,6 +47,12 private slots:
47 void spanY();
47 void spanY();
48 void zoom_data();
48 void zoom_data();
49 void zoom();
49 void zoom();
50 void move_data();
51 void move();
52 void handleAxisXChanged_data();
53 void handleAxisXChanged();
54 void handleAxisYChanged_data();
55 void handleAxisYChanged();
50 };
56 };
51
57
52 void tst_Domain::initTestCase()
58 void tst_Domain::initTestCase()
@@ -93,8 +99,8 void tst_Domain::handleAxisRangeXChanged()
93 Domain domain;
99 Domain domain;
94
100
95 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
101 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
96 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
102 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
97 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
103 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
98
104
99 domain.handleAxisXChanged(min, max);
105 domain.handleAxisXChanged(min, max);
100
106
@@ -121,7 +127,6 void tst_Domain::handleAxisRangeYChanged_data()
121 QTest::newRow("-1 0") << -1.0 << 0.0;
127 QTest::newRow("-1 0") << -1.0 << 0.0;
122 }
128 }
123
129
124
125 void tst_Domain::handleAxisRangeYChanged()
130 void tst_Domain::handleAxisRangeYChanged()
126 {
131 {
127 QFETCH(qreal, min);
132 QFETCH(qreal, min);
@@ -130,8 +135,8 void tst_Domain::handleAxisRangeYChanged()
130 Domain domain;
135 Domain domain;
131
136
132 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
137 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
133 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
138 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
134 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
139 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
135
140
136 domain.handleAxisYChanged(min, max,5);
141 domain.handleAxisYChanged(min, max, 5);
137
142
@@ -193,15 +198,14 void tst_Domain::maxX()
193 Domain domain;
198 Domain domain;
194
199
195 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
200 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
196 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
201 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
197 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
202 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
198
203
199 domain.setMaxX(maxX1);
204 domain.setMaxX(maxX1);
200 QCOMPARE(domain.maxX(), maxX1);
205 QCOMPARE(domain.maxX(), maxX1);
201 domain.setMaxX(maxX2);
206 domain.setMaxX(maxX2);
202 QCOMPARE(domain.maxX(), maxX2);
207 QCOMPARE(domain.maxX(), maxX2);
203
208
204
205 QCOMPARE(spy0.count(), count);
209 QCOMPARE(spy0.count(), count);
206 QCOMPARE(spy1.count(), count);
210 QCOMPARE(spy1.count(), count);
207 QCOMPARE(spy2.count(), 0);
211 QCOMPARE(spy2.count(), 0);
@@ -218,7 +222,6 void tst_Domain::maxY_data()
218 QTest::newRow("2.0") << 1.0 << 0.0 << 2;
222 QTest::newRow("2.0") << 1.0 << 0.0 << 2;
219 }
223 }
220
224
221
222 void tst_Domain::maxY()
225 void tst_Domain::maxY()
223 {
226 {
224 QFETCH(qreal, maxY1);
227 QFETCH(qreal, maxY1);
@@ -228,8 +231,8 void tst_Domain::maxY()
228 Domain domain;
231 Domain domain;
229
232
230 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
233 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
231 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
234 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
232 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
235 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
233
236
234 domain.setMaxY(maxY1);
237 domain.setMaxY(maxY1);
235 QCOMPARE(domain.maxY(), maxY1);
238 QCOMPARE(domain.maxY(), maxY1);
@@ -251,7 +254,6 void tst_Domain::minX_data()
251 QTest::newRow("2.0") << 1.0 << 0.0 << 2;
254 QTest::newRow("2.0") << 1.0 << 0.0 << 2;
252 }
255 }
253
256
254
255 void tst_Domain::minX()
257 void tst_Domain::minX()
256 {
258 {
257 QFETCH(qreal, minX1);
259 QFETCH(qreal, minX1);
@@ -261,8 +263,8 void tst_Domain::minX()
261 Domain domain;
263 Domain domain;
262
264
263 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
265 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
264 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
266 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
265 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
267 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
266
268
267 domain.setMinX(minX1);
269 domain.setMinX(minX1);
268 QCOMPARE(domain.minX(), minX1);
270 QCOMPARE(domain.minX(), minX1);
@@ -293,8 +295,8 void tst_Domain::minY()
293 Domain domain;
295 Domain domain;
294
296
295 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
297 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
296 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
298 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
297 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
299 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
298
300
299 domain.setMinY(minY1);
301 domain.setMinY(minY1);
300 QCOMPARE(domain.minY(), minY1);
302 QCOMPARE(domain.minY(), minY1);
@@ -343,8 +345,8 void tst_Domain::operatorEquals()
343 Domain domain;
345 Domain domain;
344
346
345 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
347 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
346 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
348 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
347 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
349 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
348
350
349 QCOMPARE(*domain1==*domain2, equals);
351 QCOMPARE(*domain1==*domain2, equals);
350 QCOMPARE(*domain1!=*domain2, notEquals);
352 QCOMPARE(*domain1!=*domain2, notEquals);
@@ -375,8 +377,8 void tst_Domain::setRange()
375 Domain domain;
377 Domain domain;
376
378
377 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
379 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
378 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
380 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
379 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
381 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
380
382
381 domain.setRange(minX, maxX, minY, maxY);
383 domain.setRange(minX, maxX, minY, maxY);
382
384
@@ -389,7 +391,6 void tst_Domain::setRange()
389 QCOMPARE(spy1.count(), 1);
391 QCOMPARE(spy1.count(), 1);
390 QCOMPARE(spy2.count(), 1);
392 QCOMPARE(spy2.count(), 1);
391
393
392
393 }
394 }
394
395
395 void tst_Domain::setRangeX_data()
396 void tst_Domain::setRangeX_data()
@@ -409,8 +410,8 void tst_Domain::setRangeX()
409 Domain domain;
410 Domain domain;
410
411
411 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
412 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
412 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
413 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
413 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
414 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
414
415
415 domain.setRangeX(min, max);
416 domain.setRangeX(min, max);
416
417
@@ -444,8 +445,8 void tst_Domain::setRangeY()
444 Domain domain;
445 Domain domain;
445
446
446 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
447 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
447 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
448 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
448 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
449 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
449
450
450 domain.setRangeY(min, max);
451 domain.setRangeY(min, max);
451
452
@@ -482,8 +483,8 void tst_Domain::spanX()
482 domain.setRangeX(minX,maxX);
483 domain.setRangeX(minX, maxX);
483
484
484 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
485 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
485 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
486 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
486 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
487 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
487
488
488 QCOMPARE(domain.spanX(), spanX);
489 QCOMPARE(domain.spanX(), spanX);
489
490
@@ -512,8 +513,8 void tst_Domain::spanY()
512 domain.setRangeY(minY,maxY);
513 domain.setRangeY(minY, maxY);
513
514
514 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
515 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
515 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
516 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
516 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
517 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
517
518
518 QCOMPARE(domain.spanY(), spanY);
519 QCOMPARE(domain.spanY(), spanY);
519
520
@@ -522,7 +523,6 void tst_Domain::spanY()
522 QCOMPARE(spy2.count(), 0);
523 QCOMPARE(spy2.count(), 0);
523 }
524 }
524
525
525
526 void tst_Domain::zoom_data()
526 void tst_Domain::zoom_data()
527 {
527 {
528 QTest::addColumn<QRectF>("rect0");
528 QTest::addColumn<QRectF>("rect0");
@@ -531,9 +531,14 void tst_Domain::zoom_data()
531 QTest::addColumn<QSizeF>("size1");
531 QTest::addColumn<QSizeF>("size1");
532 QTest::addColumn<QRectF>("rect2");
532 QTest::addColumn<QRectF>("rect2");
533 QTest::addColumn<QSizeF>("size2");
533 QTest::addColumn<QSizeF>("size2");
534 QTest::newRow("first") << QRectF(10,10,100,100) << QSizeF(1000,1000) << QRectF(20,20,100,100) << QSizeF(1000,1000) << QRectF(50,50,100,100) << QSizeF(1000,1000);
534 QTest::newRow("first") << QRectF(10, 10, 100, 100) << QSizeF(1000, 1000)
535 QTest::newRow("scound") << QRectF(10,10,50,50) << QSizeF(1000,1000) << QRectF(20,20,100,100) << QSizeF(1000,1000) << QRectF(50,50,100,100) << QSizeF(1000,1000);
535 << QRectF(20, 20, 100, 100) << QSizeF(1000, 1000) << QRectF(50, 50, 100, 100)
536 QTest::newRow("third") << QRectF(10,10,10,10) << QSizeF(100,100) << QRectF(20,20,20,20) << QSizeF(100,100) << QRectF(50,50,50,50) << QSizeF(100,100);
536 << QSizeF(1000, 1000);
537 QTest::newRow("scound") << QRectF(10, 10, 50, 50) << QSizeF(1000, 1000)
538 << QRectF(20, 20, 100, 100) << QSizeF(1000, 1000) << QRectF(50, 50, 100, 100)
539 << QSizeF(1000, 1000);
540 QTest::newRow("third") << QRectF(10, 10, 10, 10) << QSizeF(100, 100) << QRectF(20, 20, 20, 20)
541 << QSizeF(100, 100) << QRectF(50, 50, 50, 50) << QSizeF(100, 100);
537 }
542 }
538
543
539 void tst_Domain::zoom()
544 void tst_Domain::zoom()
@@ -550,8 +555,8 void tst_Domain::zoom()
550 domain.setRange(0,1000,0,1000);
555 domain.setRange(0, 1000, 0, 1000);
551
556
552 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
557 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
553 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal)));
558 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
554 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal)));
559 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
555
560
556 Domain domain0;
561 Domain domain0;
557 domain0.setRange(domain.minX(),domain.maxX(),domain.minY(),domain.maxY());
562 domain0.setRange(domain.minX(), domain.maxX(), domain.minY(), domain.maxY());
@@ -574,6 +579,114 void tst_Domain::zoom()
574
579
575 }
580 }
576
581
582 void tst_Domain::move_data()
583 {
584 QTest::addColumn<int>("dx");
585 QTest::addColumn<int>("dy");
586 QTest::addColumn<QSizeF>("size");
587 QTest::newRow("dx 100, dy 0, size 1000x1000") << 100 << 0 << QSizeF(1000, 1000);
588 QTest::newRow("dx 0, dy 100, size 1000x1000") << 0 << 100 << QSizeF(1000, 1000);
589 QTest::newRow("dx -100, dy 0, size 1000x1000") << -100 << 0 << QSizeF(1000, 1000);
590 QTest::newRow("dx 0, dy -100, size 1000x1000") << 0 << -100 << QSizeF(1000, 1000);
591 QTest::newRow("dx 100, dy 100, size 1000x1000") << 100 << 100 << QSizeF(1000, 1000);
592 QTest::newRow("dx 100, dy 50, size 1000x1000") << 100 << 50 << QSizeF(1000, 1000);
593 }
594
595 void tst_Domain::move()
596 {
597 QFETCH(int, dx);
598 QFETCH(int, dy);
599 QFETCH(QSizeF, size);
600 Domain domain;
601
602 domain.setRange(0, size.width(), 0, size.height());
603
604 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
605 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
606 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
607
608 domain.move(dx, dy, size);
609
610 Domain result;
611 result.setRange(dx, size.width() + dx, dy, size.height() + dy);
612
613 QCOMPARE(domain == result, true);
614 QCOMPARE(spy0.count(), 1);
615 QCOMPARE(spy1.count(), dx!=0?1:0);
616 QCOMPARE(spy2.count(), dy!=0?1:0);
617 }
618
619 void tst_Domain::handleAxisXChanged_data()
620 {
621 QTest::addColumn<qreal>("min");
622 QTest::addColumn<qreal>("max");
623 QTest::addColumn<int>("tickCount");
624 QTest::addColumn<bool>("niceNumbers");
625 QTest::addColumn<qreal>("resultMin");
626 QTest::addColumn<qreal>("resultMax");
627 QTest::addColumn<int>("resultTickCount");
628 QTest::newRow("0,100,5,false") << 0.0 << 100.0 << 5 << false << 0.0 << 100.0 << 5;
629 QTest::newRow("0,100,5,true") << 0.0 << 100.0 << 5 << true << 0.0 << 100.0 << 6;
630 QTest::newRow("0.1,99,5,true") << 0.1 << 99.0 << 5 << true << 0.0 << 100.0 << 6;
631 QTest::newRow("5,93.5,true") << 5.0 << 93.5 << 5 << true << 0.0 << 100.0 << 6;
632 }
633
634 void tst_Domain::handleAxisXChanged()
635 {
636 QFETCH(qreal, min);
637 QFETCH(qreal, max);
638 QFETCH(int, tickCount);
639 QFETCH(bool, niceNumbers);
640 QFETCH(qreal, resultMin);
641 QFETCH(qreal, resultMax);
642 QFETCH(int, resultTickCount);
643
644 Domain domain;
645 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
646 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
647 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
648
649 domain.handleAxisXChanged(min, max, tickCount, niceNumbers);
650
651 QCOMPARE(resultMin, domain.minX());
652 QCOMPARE(resultMax, domain.maxX());
653 QCOMPARE(resultTickCount, domain.tickXCount());
654 QCOMPARE(spy0.count(), 1);
655 QCOMPARE(spy1.count(), 1);
656 QCOMPARE(spy2.count(), 0);
657
658 }
659
660 void tst_Domain::handleAxisYChanged_data()
661 {
662 handleAxisXChanged_data();
663 }
664
665 void tst_Domain::handleAxisYChanged()
666 {
667 QFETCH(qreal, min);
668 QFETCH(qreal, max);
669 QFETCH(int, tickCount);
670 QFETCH(bool, niceNumbers);
671 QFETCH(qreal, resultMin);
672 QFETCH(qreal, resultMax);
673 QFETCH(int, resultTickCount);
674
675 Domain domain;
676 QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal)));
677 QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int )));
678 QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int )));
679
680 domain.handleAxisYChanged(min, max, tickCount, niceNumbers);
681
682 QCOMPARE(resultMin, domain.minY());
683 QCOMPARE(resultMax, domain.maxY());
684 QCOMPARE(resultTickCount, domain.tickYCount());
685 QCOMPARE(spy0.count(), 1);
686 QCOMPARE(spy1.count(), 0);
687 QCOMPARE(spy2.count(), 1);
688 }
689
577 QTEST_MAIN(tst_Domain)
690 QTEST_MAIN(tst_Domain)
578 #include "tst_domain.moc"
691 #include "tst_domain.moc"
579
692
General Comments 0
You need to be logged in to leave comments. Login now