diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-08-03 14:09:30 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-08-06 12:46:02 +0000 |
commit | 814ff4c73ced4706da8ca72e5124a59523e5efc4 (patch) | |
tree | 9c5fc275f9734933cde4bff4772e34a74162fcfd /tests | |
parent | a9b9875acc6155f85558bb27cdb75f2dda5e2b66 (diff) |
tst_FlickableInterop: use categorized logging rather than qDebug
Don't slow down CI for logging unless the test fails.
Change-Id: I2d5faedf3fadb30ec5a732445d695bda7e290233
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp index 2e48330758..2d8b16cadd 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp +++ b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -190,8 +190,8 @@ void tst_FlickableInterop::touchDragFlickableBehindButton() QTest::touchEvent(window, touchDevice).move(1, p1, window); QQuickTouchUtils::flush(window); } + qCDebug(lcPointerTests) << "flickable started moving after" << i << "moves, when we got to" << p1; QVERIFY(flickable->isMoving()); - qDebug() << "flickable started moving after" << i << "moves, when we got to" << p1; QCOMPARE(i, 2); QVERIFY(!button->property("pressed").toBool()); QTest::touchEvent(window, touchDevice).release(1, p1, window); @@ -278,7 +278,7 @@ void tst_FlickableInterop::mouseDragFlickableBehindButton() p1 += QPoint(1, 0); QTest::mouseMove(window, p1); } - qDebug() << "flickable started moving after" << i << "moves, when we got to" << p1; + qCDebug(lcPointerTests) << "flickable started moving after" << i << "moves, when we got to" << p1; QVERIFY(flickable->isMoving()); QCOMPARE(i, 2); QVERIFY(!button->property("pressed").toBool()); @@ -456,7 +456,7 @@ void tst_FlickableInterop::touchDragFlickableBehindSlider() QTest::touchEvent(window, touchDevice).move(1, p1, window); QQuickTouchUtils::flush(window); } - qDebug() << "flickable started moving after" << i << "moves, when we got to" << p1; + qCDebug(lcPointerTests) << "flickable started moving after" << i << "moves, when we got to" << p1; QVERIFY(flickable->isMoving()); QCOMPARE(i, 2); QVERIFY(!slider->property("pressed").toBool()); @@ -500,7 +500,7 @@ void tst_FlickableInterop::mouseDragFlickableBehindSlider() p1 += QPoint(1, 0); QTest::mouseMove(window, p1); } - qDebug() << "flickable started moving after" << i << "moves, when we got to" << p1; + qCDebug(lcPointerTests) << "flickable started moving after" << i << "moves, when we got to" << p1; QVERIFY(flickable->isMoving()); QCOMPARE(i, 2); QVERIFY(!slider->property("pressed").toBool()); @@ -653,7 +653,7 @@ void tst_FlickableInterop::touchDragSliderAndFlickable() qreal knobSliderXOffset = qAbs(knob->mapToScene(knob->clipRect().center()).toPoint().x() - slider->mapToScene(slider->clipRect().center()).toPoint().x()) - initialXOffset; if (knobSliderXOffset > 1) - qDebug() << "knob has slipped out of groove by" << knobSliderXOffset << "pixels"; + qCDebug(lcPointerTests) << "knob has slipped out of groove by" << knobSliderXOffset << "pixels"; // See if the knob is still centered over the slider's "groove" QVERIFY(qAbs(knobSliderXOffset) <= 1); |