summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-03-29 13:52:47 +0200
committerUlf Hermann <ulf.hermann@qt.io>2017-03-29 12:03:45 +0000
commit186f0f574af5e633d618c401155129b6823902da (patch)
treecfd035cb8a510e4c379b34e6c9c772d3a9aeddcf
parent14f3a86cf392d0fb01312a28b801005165bf8859 (diff)
downloadqt-creator-186f0f574af5e633d618c401155129b6823902da.tar.gz
Timeline: Fix timelinerenderer test
The events in question are overlapping and all match the given timestamps exactly. As we stop the search whenever we find an exact match, the results are valid. Change-Id: I705bfbdfe9105927588cc356e29209bf893a9ed6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp b/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp
index f2a88005e0..b657cb0649 100644
--- a/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp
+++ b/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp
@@ -137,16 +137,16 @@ void tst_TimelineRenderer::mouseEvents()
model.loadData();
testMouseEvents(&renderer, 1, 1);
- QCOMPARE(renderer.selectedItem(), 3);
+ QCOMPARE(renderer.selectedItem(), 2);
QCOMPARE(renderer.selectionLocked(), true);
model.setExpanded(true);
testMouseEvents(&renderer, 1, 1);
- QCOMPARE(renderer.selectedItem(), 3);
+ QCOMPARE(renderer.selectedItem(), 2);
QCOMPARE(renderer.selectionLocked(), true); // Don't toggle locked status by clicking same item
renderer.setSelectionLocked(false);
testMouseEvents(&renderer, 1, 1);
- QCOMPARE(renderer.selectedItem(), 3);
+ QCOMPARE(renderer.selectedItem(), 2);
QCOMPARE(renderer.selectionLocked(), false);
renderer.setSelectionLocked(true);
testMouseEvents(&renderer, 1, 40);
@@ -157,7 +157,7 @@ void tst_TimelineRenderer::mouseEvents()
QCOMPARE(renderer.selectedItem(), -1);
QCOMPARE(renderer.selectionLocked(), false);
testMouseEvents(&renderer, 10, 1);
- QCOMPARE(renderer.selectedItem(), 19);
+ QCOMPARE(renderer.selectedItem(), 14);
QCOMPARE(renderer.selectionLocked(), false);
renderer.setSelectionLocked(true);