##// END OF EJS Templates
removing groupedbartest
sauimone -
r1599:ab53d7df7636
parent child
Show More
@@ -1,10 +1,10
1 1 !include( ../tests.pri ) {
2 2 error( "Couldn't find the tests.pri file!" )
3 3 }
4 4
5 5 TEMPLATE = subdirs
6 SUBDIRS += qchartview qchart qlineseries qbarset qbarseries qstackedbarseries qpercentbarseries qpieslice qpieseries qpiemodelmapper qsplineseries qscatterseries qxymodelmapper qbarmodelmapper #qgroupedbarseries
6 SUBDIRS += qchartview qchart qlineseries qbarset qbarseries qstackedbarseries qpercentbarseries qpieslice qpieseries qpiemodelmapper qsplineseries qscatterseries qxymodelmapper qbarmodelmapper
7 7
8 8 test_private:{
9 9 SUBDIRS += domain chartdataset
10 10 }
@@ -1,571 +1,576
1 1 /****************************************************************************
2 2 **
3 3 ** Copyright (C) 2012 Digia Plc
4 4 ** All rights reserved.
5 5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 6 **
7 7 ** This file is part of the Qt Commercial Charts Add-on.
8 8 **
9 9 ** $QT_BEGIN_LICENSE$
10 10 ** Licensees holding valid Qt Commercial licenses may use this file in
11 11 ** accordance with the Qt Commercial License Agreement provided with the
12 12 ** Software or, alternatively, in accordance with the terms contained in
13 13 ** a written agreement between you and Digia.
14 14 **
15 15 ** If you have questions regarding the use of this file, please use
16 16 ** contact form at http://qt.digia.com
17 17 ** $QT_END_LICENSE$
18 18 **
19 19 ****************************************************************************/
20 20
21 21 #include <QtTest/QtTest>
22 22 #include <qbarseries.h>
23 23 #include <qbarset.h>
24 24 #include <qchartview.h>
25 25 #include <qchart.h>
26 26 #include "tst_definitions.h"
27 27
28 28 QTCOMMERCIALCHART_USE_NAMESPACE
29 29
30 30 Q_DECLARE_METATYPE(QBarSet*)
31 31
32 32 class tst_QBarSeries : public QObject
33 33 {
34 34 Q_OBJECT
35 35
36 36 public slots:
37 37 void initTestCase();
38 38 void cleanupTestCase();
39 39 void init();
40 40 void cleanup();
41 41
42 42 private slots:
43 43 void qbarseries_data();
44 44 void qbarseries();
45 45 void type_data();
46 46 void type();
47 47 void append_data();
48 48 void append();
49 49 void remove_data();
50 50 void remove();
51 51 void appendList_data();
52 52 void appendList();
53 53 void count_data();
54 54 void count();
55 55 void barSets_data();
56 56 void barSets();
57 57 void setLabelsVisible_data();
58 58 void setLabelsVisible();
59 59 void mouseclicked_data();
60 60 void mouseclicked();
61 61 void mousehovered_data();
62 62 void mousehovered();
63 63 void clearWithAnimations();
64 64
65 65 private:
66 66 QBarSeries* m_barseries;
67 67 QBarSeries* m_barseries_with_sets;
68 68
69 69 QList<QBarSet*> m_testSets;
70 70
71 71 };
72 72
73 73 void tst_QBarSeries::initTestCase()
74 74 {
75 75 qRegisterMetaType<QBarSet*>("QBarSet*");
76 76 }
77 77
78 78 void tst_QBarSeries::cleanupTestCase()
79 79 {
80 80 }
81 81
82 82 void tst_QBarSeries::init()
83 83 {
84 84 m_barseries = new QBarSeries();
85 85 m_barseries_with_sets = new QBarSeries();
86 86
87 87 for (int i=0; i<5; i++) {
88 88 m_testSets.append(new QBarSet("testset"));
89 89 m_barseries_with_sets->append(m_testSets.at(i));
90 90 }
91 91 }
92 92
93 93 void tst_QBarSeries::cleanup()
94 94 {
95 95 foreach(QBarSet* s, m_testSets) {
96 96 m_barseries_with_sets->remove(s);
97 97 delete s;
98 98 }
99 99 m_testSets.clear();
100 100
101 101 delete m_barseries;
102 102 m_barseries = 0;
103 103 delete m_barseries_with_sets;
104 104 m_barseries_with_sets = 0;
105 105 }
106 106
107 107 void tst_QBarSeries::qbarseries_data()
108 108 {
109 109 }
110 110
111 111 void tst_QBarSeries::qbarseries()
112 112 {
113 113 QBarSeries *barseries = new QBarSeries();
114 114 QVERIFY(barseries != 0);
115 115 }
116 116
117 117 void tst_QBarSeries::type_data()
118 118 {
119 119
120 120 }
121 121
122 122 void tst_QBarSeries::type()
123 123 {
124 124 QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeBar);
125 125 }
126 126
127 127 void tst_QBarSeries::append_data()
128 128 {
129 129 }
130 130
131 131 void tst_QBarSeries::append()
132 132 {
133 133 QVERIFY(m_barseries->count() == 0);
134 134
135 135 bool ret = false;
136 136
137 137 // Try adding barset
138 138 QBarSet *barset = new QBarSet("testset");
139 139 ret = m_barseries->append(barset);
140 140
141 141 QVERIFY(ret == true);
142 142 QVERIFY(m_barseries->count() == 1);
143 143
144 144 // Try adding another set
145 145 QBarSet *barset2 = new QBarSet("testset2");
146 146 ret = m_barseries->append(barset2);
147 147
148 148 QVERIFY(ret == true);
149 149 QVERIFY(m_barseries->count() == 2);
150 150
151 151 // Try adding same set again
152 152 ret = m_barseries->append(barset2);
153 153 QVERIFY(ret == false);
154 154 QVERIFY(m_barseries->count() == 2);
155 155
156 156 // Try adding null set
157 157 ret = m_barseries->append(0);
158 158 QVERIFY(ret == false);
159 159 QVERIFY(m_barseries->count() == 2);
160 160
161 161 }
162 162
163 163 void tst_QBarSeries::remove_data()
164 164 {
165 165 }
166 166
167 167 void tst_QBarSeries::remove()
168 168 {
169 169 int count = m_testSets.count();
170 170 QVERIFY(m_barseries_with_sets->count() == count);
171 171
172 172 // Try to remove null pointer (should not remove, should not crash)
173 173 bool ret = false;
174 174 ret = m_barseries_with_sets->remove(0);
175 175 QVERIFY(ret == false);
176 176 QVERIFY(m_barseries_with_sets->count() == count);
177 177
178 178 // Try to remove invalid pointer (should not remove, should not crash)
179 179 ret = m_barseries_with_sets->remove((QBarSet*) (m_testSets.at(0) + 1) );
180 180 QVERIFY(ret == false);
181 181 QVERIFY(m_barseries_with_sets->count() == count);
182 182
183 183 // remove some sets
184 184 ret = m_barseries_with_sets->remove(m_testSets.at(2));
185 185 QVERIFY(ret == true);
186 186 ret = m_barseries_with_sets->remove(m_testSets.at(3));
187 187 QVERIFY(ret == true);
188 188 ret = m_barseries_with_sets->remove(m_testSets.at(4));
189 189 QVERIFY(ret == true);
190 190
191 191 QVERIFY(m_barseries_with_sets->count() == 2);
192 192
193 193 QList<QBarSet*> verifysets = m_barseries_with_sets->barSets();
194 194
195 195 QVERIFY(verifysets.at(0) == m_testSets.at(0));
196 196 QVERIFY(verifysets.at(1) == m_testSets.at(1));
197 197
198 198 // Try removing all sets again (should be ok, even if some sets have already been removed)
199 199 ret = false;
200 200 for (int i=0; i<count; i++) {
201 201 ret |= m_barseries_with_sets->remove(m_testSets.at(i));
202 202 }
203 203
204 204 QVERIFY(ret == true);
205 205 QVERIFY(m_barseries_with_sets->count() == 0);
206 206 }
207 207
208 208 void tst_QBarSeries::appendList_data()
209 209 {
210 210
211 211 }
212 212
213 213 void tst_QBarSeries::appendList()
214 214 {
215 215 int count = 5;
216 216 QVERIFY(m_barseries->count() == 0);
217 217
218 218 QList<QBarSet*> sets;
219 219 for (int i=0; i<count; i++) {
220 220 sets.append(new QBarSet("testset"));
221 221 }
222 222
223 223 // Append new sets (should succeed, count should match the count of sets)
224 224 bool ret = false;
225 225 ret = m_barseries->append(sets);
226 226 QVERIFY(ret == true);
227 227 QVERIFY(m_barseries->count() == count);
228 228
229 229 // Append same sets again (should fail, count should remain same)
230 230 ret = m_barseries->append(sets);
231 231 QVERIFY(ret == false);
232 232 QVERIFY(m_barseries->count() == count);
233 233
234 234 // Try append empty list (should succeed, but count should remain same)
235 235 QList<QBarSet*> invalidList;
236 236 ret = m_barseries->append(invalidList);
237 237 QVERIFY(ret == true);
238 238 QVERIFY(m_barseries->count() == count);
239 239
240 240 // Try append list with one new and one existing set (should fail, count remains same)
241 241 invalidList.append(new QBarSet("ok set"));
242 242 invalidList.append(sets.at(0));
243 243 ret = m_barseries->append(invalidList);
244 244 QVERIFY(ret == false);
245 245 QVERIFY(m_barseries->count() == count);
246 246
247 247 // Try append list with null pointers (should fail, count remains same)
248 248 QList<QBarSet*> invalidList2;
249 249 invalidList2.append(0);
250 250 invalidList2.append(0);
251 251 invalidList2.append(0);
252 252 ret = m_barseries->append(invalidList2);
253 253 QVERIFY(ret == false);
254 254 QVERIFY(m_barseries->count() == count);
255 255 }
256 256
257 257 void tst_QBarSeries::count_data()
258 258 {
259 259
260 260 }
261 261
262 262 void tst_QBarSeries::count()
263 263 {
264 264 QVERIFY(m_barseries->count() == 0);
265 265 QVERIFY(m_barseries_with_sets->count() == m_testSets.count());
266 266 }
267 267
268 268 void tst_QBarSeries::barSets_data()
269 269 {
270 270
271 271 }
272 272
273 273 void tst_QBarSeries::barSets()
274 274 {
275 275 QVERIFY(m_barseries->barSets().count() == 0);
276 276
277 277 QList<QBarSet*> sets = m_barseries_with_sets->barSets();
278 278 QVERIFY(sets.count() == m_testSets.count());
279 279
280 280 for (int i=0; i<m_testSets.count(); i++) {
281 281 QVERIFY(sets.at(i) == m_testSets.at(i));
282 282 }
283 283 }
284 284
285 285 void tst_QBarSeries::setLabelsVisible_data()
286 286 {
287 287
288 288 }
289 289
290 290 void tst_QBarSeries::setLabelsVisible()
291 291 {
292 292 // labels should be invisible by default
293 293 QVERIFY(m_barseries->isLabelsVisible() == false);
294 294 QVERIFY(m_barseries_with_sets->isLabelsVisible() == false);
295 295
296 296 // turn labels to visible
297 297 m_barseries_with_sets->setLabelsVisible(true);
298 298 // TODO: test the signal
299 299 QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
300 300
301 301 // turn labels to invisible
302 302 m_barseries_with_sets->setLabelsVisible(false);
303 303 // TODO: test the signal
304 304 QVERIFY(m_barseries_with_sets->isLabelsVisible() == false);
305 305
306 306 // without parameter, should turn labels to visible
307 307 m_barseries_with_sets->setLabelsVisible();
308 308 // TODO: test the signal
309 309 QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
310 310 }
311 311
312 312 void tst_QBarSeries::mouseclicked_data()
313 313 {
314 314
315 315 }
316 316
317 317 void tst_QBarSeries::mouseclicked()
318 318 {
319 319 QBarSeries* series = new QBarSeries();
320 320
321 321 QBarSet* set1 = new QBarSet(QString("set 1"));
322 322 *set1 << 10 << 10 << 10;
323 323 series->append(set1);
324 324
325 325 QBarSet* set2 = new QBarSet(QString("set 2"));
326 326 *set2 << 10 << 10 << 10;
327 327 series->append(set2);
328 328
329 329 QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*)));
330 330 QSignalSpy setSpy1(set1, SIGNAL(clicked(int)));
331 331 QSignalSpy setSpy2(set2, SIGNAL(clicked(int)));
332 332
333 333 QChartView view(new QChart());
334 334 view.resize(400,300);
335 335 view.chart()->addSeries(series);
336 336 view.show();
337 337 QTest::qWaitForWindowShown(&view);
338 338
339 339 //====================================================================================
340 340 // barset 1, bar 0
341 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(102,142));
341 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(95,143));
342 342 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
343 343
344 344 QCOMPARE(seriesSpy.count(), 1);
345 345 QCOMPARE(setSpy1.count(), 1);
346 346 QCOMPARE(setSpy2.count(), 0);
347 347
348 348 QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
349 349 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
350 350 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
351 351 QVERIFY(seriesSpyArg.at(0).toInt() == 0);
352 352
353 353 QList<QVariant> setSpyArg = setSpy1.takeFirst();
354 354 QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
355 355 QVERIFY(setSpyArg.at(0).toInt() == 0);
356 356
357 357 //====================================================================================
358 358 // barset 1, bar 1
359 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(186,142));
359 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(187,143));
360 360 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
361 361
362 362 QCOMPARE(seriesSpy.count(), 1);
363 363 QCOMPARE(setSpy1.count(), 1);
364 364 QCOMPARE(setSpy2.count(), 0);
365 365
366 366 seriesSpyArg = seriesSpy.takeFirst();
367 367 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
368 368 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
369 369 QVERIFY(seriesSpyArg.at(0).toInt() == 1);
370 370
371 371 setSpyArg = setSpy1.takeFirst();
372 372 QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
373 373 QVERIFY(setSpyArg.at(0).toInt() == 1);
374 374
375 375 //====================================================================================
376 376 // barset 1, bar 2
377 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(271,142));
377 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(280,143));
378 378 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
379 379
380 380 QCOMPARE(seriesSpy.count(), 1);
381 381 QCOMPARE(setSpy1.count(), 1);
382 382 QCOMPARE(setSpy2.count(), 0);
383 383
384 384 seriesSpyArg = seriesSpy.takeFirst();
385 385 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
386 386 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
387 387 QVERIFY(seriesSpyArg.at(0).toInt() == 2);
388 388
389 389 setSpyArg = setSpy1.takeFirst();
390 390 QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
391 391 QVERIFY(setSpyArg.at(0).toInt() == 2);
392 392
393 393 //====================================================================================
394 394 // barset 2, bar 0
395 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(127,142));
395 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(118,143));
396 396 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
397 397
398 398 QCOMPARE(seriesSpy.count(), 1);
399 399 QCOMPARE(setSpy1.count(), 0);
400 400 QCOMPARE(setSpy2.count(), 1);
401 401
402 402 seriesSpyArg = seriesSpy.takeFirst();
403 403 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
404 404 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
405 405 QVERIFY(seriesSpyArg.at(0).toInt() == 0);
406 406
407 407 setSpyArg = setSpy2.takeFirst();
408 408 QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
409 409 QVERIFY(setSpyArg.at(0).toInt() == 0);
410 410
411 411 //====================================================================================
412 412 // barset 2, bar 1
413 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(212,142));
413 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(210,143));
414 414 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
415 415
416 416 QCOMPARE(seriesSpy.count(), 1);
417 417 QCOMPARE(setSpy1.count(), 0);
418 418 QCOMPARE(setSpy2.count(), 1);
419 419
420 420 seriesSpyArg = seriesSpy.takeFirst();
421 421 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
422 422 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
423 423 QVERIFY(seriesSpyArg.at(0).toInt() == 1);
424 424
425 425 setSpyArg = setSpy2.takeFirst();
426 426 QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
427 427 QVERIFY(setSpyArg.at(0).toInt() == 1);
428 428
429 429 //====================================================================================
430 430 // barset 2, bar 2
431 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(296,142));
431 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(303,143));
432 432 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
433 433
434 434 QCOMPARE(seriesSpy.count(), 1);
435 435 QCOMPARE(setSpy1.count(), 0);
436 436 QCOMPARE(setSpy2.count(), 1);
437 437
438 438 seriesSpyArg = seriesSpy.takeFirst();
439 439 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
440 440 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
441 441 QVERIFY(seriesSpyArg.at(0).toInt() == 2);
442 442
443 443 setSpyArg = setSpy2.takeFirst();
444 444 QVERIFY(setSpyArg.at(0).type() == QVariant::Int);
445 445 QVERIFY(setSpyArg.at(0).toInt() == 2);
446 446 }
447 447
448 448 void tst_QBarSeries::mousehovered_data()
449 449 {
450 450
451 451 }
452 452
453 453 void tst_QBarSeries::mousehovered()
454 454 {
455 455 QBarSeries* series = new QBarSeries();
456 456
457 457 QBarSet* set1 = new QBarSet(QString("set 1"));
458 458 *set1 << 10 << 10 << 10;
459 459 series->append(set1);
460 460
461 461 QBarSet* set2 = new QBarSet(QString("set 2"));
462 462 *set2 << 10 << 10 << 10;
463 463 series->append(set2);
464 464
465 465 QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*)));
466 466 QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
467 467 QSignalSpy setSpy2(set2, SIGNAL(hovered(bool)));
468 468
469 469 QChartView view(new QChart());
470 470 view.resize(400,300);
471 471 view.chart()->addSeries(series);
472 472 view.show();
473 473 QTest::qWaitForWindowShown(&view);
474 474
475 475 //this is hack since view does not get events otherwise
476 476 view.setMouseTracking(true);
477 477
478 478 //=======================================================================
479 479 // move mouse to left border
480 QTest::mouseMove(view.viewport(), QPoint(0, 142));
480 qDebug() << "move mouse to left border";
481 QTest::mouseMove(view.viewport(), QPoint(0, 143));
481 482 QCoreApplication::processEvents(QEventLoop::AllEvents, 10000);
482 483 TRY_COMPARE(seriesSpy.count(), 0);
483 484 TRY_COMPARE(setSpy1.count(), 0);
484 485 TRY_COMPARE(setSpy2.count(), 0);
485 486
486 487 //=======================================================================
487 488 // move mouse on top of set1
488 QTest::mouseMove(view.viewport(), QPoint(102,142));
489 qDebug() << "move mouse on top of set1";
490 QTest::mouseMove(view.viewport(), QPoint(95,143));
489 491 TRY_COMPARE(seriesSpy.count(), 1);
490 492 TRY_COMPARE(setSpy1.count(), 1);
491 493 TRY_COMPARE(setSpy2.count(), 0);
492 494
493 495 QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
494 496 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
495 497 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool);
496 498 QVERIFY(seriesSpyArg.at(0).toBool() == true);
497 499
498 500 QList<QVariant> setSpyArg = setSpy1.takeFirst();
499 501 QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
500 502 QVERIFY(setSpyArg.at(0).toBool() == true);
501 503
502 504 //=======================================================================
503 505 // move mouse from top of set1 to top of set2
504 QTest::mouseMove(view.viewport(), QPoint(127,142));
506 qDebug() << "move mouse from top of set1 to top of set2";
507 QTest::mouseMove(view.viewport(), QPoint(118,143));
505 508 TRY_COMPARE(seriesSpy.count(), 2);
506 509 TRY_COMPARE(setSpy1.count(), 1);
507 510 TRY_COMPARE(setSpy2.count(), 1);
508 511
509 512 // should leave set1
510 513 seriesSpyArg = seriesSpy.takeFirst();
511 514 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
512 515 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool);
513 516 QVERIFY(seriesSpyArg.at(0).toBool() == false);
514 517
515 518 setSpyArg = setSpy1.takeFirst();
516 519 QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
517 520 QVERIFY(setSpyArg.at(0).toBool() == false);
518 521
519 522 // should enter set2
520 523 seriesSpyArg = seriesSpy.takeFirst();
521 524 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
522 525 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool);
523 526 QVERIFY(seriesSpyArg.at(0).toBool() == true);
524 527
525 528 setSpyArg = setSpy2.takeFirst();
526 529 QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
527 530 QVERIFY(setSpyArg.at(0).toBool() == true);
528 531
529 532 //=======================================================================
530 533 // move mouse from top of set2 to background
531 QTest::mouseMove(view.viewport(), QPoint(127,0));
534 qDebug() << "move mouse from top of set2 to background";
535
536 QTest::mouseMove(view.viewport(), QPoint(118,0));
532 537 TRY_COMPARE(seriesSpy.count(), 1);
533 538 TRY_COMPARE(setSpy1.count(), 0);
534 539 TRY_COMPARE(setSpy2.count(), 1);
535 540
536 541 // should leave set2
537 542 seriesSpyArg = seriesSpy.takeFirst();
538 543 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
539 544 QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool);
540 545 QVERIFY(seriesSpyArg.at(0).toBool() == false);
541 546
542 547 setSpyArg = setSpy2.takeFirst();
543 548 QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
544 549 QVERIFY(setSpyArg.at(0).toBool() == false);
545 550 }
546 551
547 552 void tst_QBarSeries::clearWithAnimations()
548 553 {
549 554 QBarSeries* series = new QBarSeries();
550 555
551 556 QBarSet* set1 = new QBarSet(QString("set 1"));
552 557 *set1 << 10 << 10 << 10;
553 558 series->append(set1);
554 559
555 560 QBarSet* set2 = new QBarSet(QString("set 2"));
556 561 *set2 << 10 << 10 << 10;
557 562 series->append(set2);
558 563
559 564 QChartView view(new QChart());
560 565 view.resize(400,300);
561 566 view.chart()->setAnimationOptions(QChart::SeriesAnimations);
562 567 view.chart()->addSeries(series);
563 568 view.show();
564 569
565 570 series->clear();
566 571 }
567 572
568 573 QTEST_MAIN(tst_QBarSeries)
569 574
570 575 #include "tst_qbarseries.moc"
571 576
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now