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

QmlProfiler: Provide a sane ctor for QmlEventType and use it

Browse Source 
... in turn, make its members private, so that we don't accidentally
change them.

Change-Id: Ibc65b406ee341d33f69647ed1b19e1e34f5cd535
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-06-06 19:51:55 +02:00
parent 5718f12af5
commit e10bc709bc
23 changed files with 267 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/qmlprofiler/tests/memoryusagemodel_test.cpp
View File

@@ -39,16 +39,13 @@ void MemoryUsageModelTest::initTestCase()
manager.startAcquiring();
qint64 timestamp = 0;
QmlEventType type;
type.message = MemoryAllocation;
type.rangeType = MaximumRangeType;
type.detailType = HeapPage;
heapPageTypeId = manager.qmlModel()->addEventType(type);
type.detailType = SmallItem;
smallItemTypeId = manager.qmlModel()->addEventType(type);
type.detailType = LargeItem;
largeItemTypeId = manager.qmlModel()->addEventType(type);
heapPageTypeId = manager.qmlModel()->addEventType(
QmlEventType(MemoryAllocation, MaximumRangeType, HeapPage));
smallItemTypeId = manager.qmlModel()->addEventType(
QmlEventType(MemoryAllocation, MaximumRangeType, SmallItem));
largeItemTypeId = manager.qmlModel()->addEventType(
QmlEventType(MemoryAllocation, MaximumRangeType, LargeItem));
auto addMemoryEvents = [&]() {
QmlEvent event;
@@ -75,12 +72,10 @@ void MemoryUsageModelTest::initTestCase()
};
addMemoryEvents();
QmlEventType rangeType;
rangeType.message = MaximumMessage;
rangeType.rangeType = Javascript;
rangeType.data = QString("funcfunc");
rangeType.location = QmlEventLocation(QString("somefile.js"), 10, 20);
rangeTypeId = manager.qmlModel()->addEventType(rangeType);
rangeTypeId = manager.qmlModel()->addEventType(
QmlEventType(MaximumMessage, Javascript, -1,
QmlEventLocation(QString("somefile.js"), 10, 20),
QString("funcfunc")));
QmlEvent event;
event.setRangeStage(RangeStart);
@@ -229,16 +224,10 @@ void MemoryUsageModelTest::testRelativeHeight()
void MemoryUsageModelTest::testAccepted()
{
QmlEventType type;
QVERIFY(!model.accepted(type));
type.detailType = HeapPage;
QVERIFY(!model.accepted(type));
type.message = MemoryAllocation;
QVERIFY(model.accepted(type));
type.message = MaximumMessage;
type.rangeType = Javascript;
QVERIFY(model.accepted(type));
QVERIFY(!model.accepted(QmlEventType()));
QVERIFY(!model.accepted(QmlEventType(MaximumMessage, MaximumRangeType, HeapPage)));
QVERIFY(model.accepted(QmlEventType(MemoryAllocation, MaximumRangeType, HeapPage)));
QVERIFY(model.accepted(QmlEventType(MaximumMessage, Javascript)));
}
void MemoryUsageModelTest::cleanupTestCase()