tst_qgraphicslinearlayout: avoid duplicate data tags in removeAt()
Avoid the duplicated data tags in removeAt() tests by adding the orientation to the tag. Pick-to: 6.5 Fixes: QTBUG-135294 Change-Id: If31d719e4a9b1c90e591cedc149848bbb9c99657 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 0b668c2f55f0fc797a2366b3dc73395f79e1b585) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 62c1f8da1e4652d6dd2ac18f658397a6af7d06d4)
This commit is contained in:
parent
ecb6111080
commit
e937243e4f
@ -714,12 +714,12 @@ void tst_QGraphicsLinearLayout::removeAt_data()
|
||||
QTest::addColumn<Qt::Orientation>("orientation");
|
||||
for (int i = -1; i < 4; ++i) {
|
||||
const QByteArray iB = QByteArray::number(i);
|
||||
for (int k = 0; k < 2; ++k) {
|
||||
Qt::Orientation orientation = (k == 0) ? Qt::Vertical : Qt::Horizontal;
|
||||
QTest::newRow(("0, 0, " + iB).constData()) << 0 << 0 << i << orientation;
|
||||
QTest::newRow(("1, 0, " + iB).constData()) << 1 << 0 << i << orientation;
|
||||
QTest::newRow(("0, 1, " + iB).constData()) << 0 << 1 << i << orientation;
|
||||
QTest::newRow(("2, 2, " + iB).constData()) << 2 << 2 << i << orientation;
|
||||
for (Qt::Orientation orientation : {Qt::Vertical, Qt::Horizontal}) {
|
||||
const QByteArray orientStr = orientation == Qt::Vertical ? ", vertical" : ", horizontal";
|
||||
QTest::newRow(("0, 0, " + iB + orientStr).constData()) << 0 << 0 << i << orientation;
|
||||
QTest::newRow(("1, 0, " + iB + orientStr).constData()) << 1 << 0 << i << orientation;
|
||||
QTest::newRow(("0, 1, " + iB + orientStr).constData()) << 0 << 1 << i << orientation;
|
||||
QTest::newRow(("2, 2, " + iB + orientStr).constData()) << 2 << 2 << i << orientation;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user