feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Accept unknown input events

Browse Source 
We might get more event types in the future and filtering them is harder
than just displaying them. Also, traces might contain invalid input
events which would trigger the assert.

Change-Id: I9b38422af953ebb65363fc2b7a91facb7f757976
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
This commit is contained in:
Ulf Hermann
2017-09-08 17:18:39 +02:00
parent cacb6b17d0
commit 13910a1176
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/inputeventsmodel.cpp
View File

@@ -126,7 +126,7 @@ QVariantMap InputEventsModel::details(int index) const
type = tr("Mouse Event"); type = tr("Mouse Event");
break; break;
default: default:
Q_UNREACHABLE(); type = tr("Unknown");
break; break;
} }

18
src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp
View File

@@ -32,6 +32,11 @@
namespace QmlProfiler { namespace QmlProfiler {
namespace Internal { namespace Internal {
static InputEventType inputType(int i)
{
return static_cast<InputEventType>(i % (MaximumInputEventType + 1));
}
InputEventsModelTest::InputEventsModelTest(QObject *parent) : InputEventsModelTest::InputEventsModelTest(QObject *parent) :
QObject(parent), manager(nullptr), model(&manager) QObject(parent), manager(nullptr), model(&manager)
{ {
@@ -48,13 +53,14 @@ void InputEventsModelTest::initTestCase()
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
event.setTimestamp(i); event.setTimestamp(i);
InputEventType type = static_cast<InputEventType>(i % MaximumInputEventType); InputEventType type = inputType(i);
event.setTypeIndex(type <= InputKeyUnknown ? keyTypeId : mouseTypeId); event.setTypeIndex(type <= InputKeyUnknown ? keyTypeId : mouseTypeId);
event.setNumbers({static_cast<qint32>(type), event.setNumbers({static_cast<qint32>(type),
(i * 32) % 256, (i * 32) % 256,
static_cast<qint32>((i * 0x02000000) & Qt::KeyboardModifierMask)}); static_cast<qint32>((i * 0x02000000) & Qt::KeyboardModifierMask)});
manager.addEvent(event); manager.addEvent(event);
} }
manager.acquiringDone(); manager.acquiringDone();
QCOMPARE(manager.state(), QmlProfilerModelManager::Done); QCOMPARE(manager.state(), QmlProfilerModelManager::Done);
} }
@@ -71,7 +77,7 @@ void InputEventsModelTest::testAccepted()
void InputEventsModelTest::testTypeId() void InputEventsModelTest::testTypeId()
{ {
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
InputEventType type = static_cast<InputEventType>(i % MaximumInputEventType); InputEventType type = inputType(i);
QCOMPARE(model.typeId(i), type <= InputKeyUnknown ? keyTypeId : mouseTypeId); QCOMPARE(model.typeId(i), type <= InputKeyUnknown ? keyTypeId : mouseTypeId);
} }
} }
@@ -81,7 +87,7 @@ void InputEventsModelTest::testColor()
QRgb keyColor = 0; QRgb keyColor = 0;
QRgb mouseColor = 0; QRgb mouseColor = 0;
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
InputEventType type = static_cast<InputEventType>(i % MaximumInputEventType); InputEventType type = inputType(i);
int selectionId = (type <= InputKeyUnknown ? Key : Mouse); int selectionId = (type <= InputKeyUnknown ? Key : Mouse);
QCOMPARE(selectionId, model.selectionId(i)); QCOMPARE(selectionId, model.selectionId(i));
@@ -112,7 +118,7 @@ void InputEventsModelTest::testDetails()
QCOMPARE(details[model.tr("Timestamp")].toString(), Timeline::formatTime(i)); QCOMPARE(details[model.tr("Timestamp")].toString(), Timeline::formatTime(i));
QString displayName = details[QString("displayName")].toString(); QString displayName = details[QString("displayName")].toString();
QVERIFY(!displayName.isEmpty()); QVERIFY(!displayName.isEmpty());
switch (static_cast<InputEventType>(i % MaximumInputEventType)) { switch (inputType(i)) {
case InputKeyPress: case InputKeyPress:
QCOMPARE(displayName, model.tr("Key Press")); QCOMPARE(displayName, model.tr("Key Press"));
if (i == 0) { if (i == 0) {
@@ -177,7 +183,7 @@ void InputEventsModelTest::testDetails()
QVERIFY(!details.contains(model.tr("Result"))); QVERIFY(!details.contains(model.tr("Result")));
break; break;
default: default:
Q_UNREACHABLE(); QCOMPARE(displayName, model.tr("Unknown"));
break; break;
} }
} }
@@ -186,7 +192,7 @@ void InputEventsModelTest::testDetails()
void InputEventsModelTest::testExpandedRow() void InputEventsModelTest::testExpandedRow()
{ {
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
InputEventType type = static_cast<InputEventType>(i % MaximumInputEventType); InputEventType type = inputType(i);
QCOMPARE(model.expandedRow(i), (type <= InputKeyUnknown ? 2 : 1)); QCOMPARE(model.expandedRow(i), (type <= InputKeyUnknown ? 2 : 1));
} }
} }