diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-02-25 17:24:28 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-08 13:24:19 +0000 |
commit | 4301f0c352ad5260536994870a5f1a5c713795a6 (patch) | |
tree | b76ff88a53f336c4707801ff9e0a30c97f246969 /tests | |
parent | 45db2b4aa04d9bca73da1dca252de7bd18edac2c (diff) |
QRenderTargetSelector renamed drawBuffers to outputs
As per API review
Change-Id: Ifaf926705d51fa17ceb3c187f6cf2d10db81dbda
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp index 7012ccff9..0fec15fe6 100644 --- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp +++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp @@ -53,13 +53,13 @@ private Q_SLOTS: QScopedPointer<Qt3DRender::QRenderTargetSelector> defaultTargetSelector(new Qt3DRender::QRenderTargetSelector); QVERIFY(defaultTargetSelector->target() == Q_NULLPTR); - QCOMPARE(defaultTargetSelector->drawBuffers().count(), 0); + QCOMPARE(defaultTargetSelector->outputs().count(), 0); } void checkCloning_data() { QTest::addColumn<Qt3DRender::QRenderTargetSelector *>("renderTargetSelector"); - QTest::addColumn<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >("drawBuffers"); + QTest::addColumn<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >("outputs"); QTest::addColumn<Qt3DRender::QRenderTarget * >("target"); Qt3DRender::QRenderTargetSelector *defaultConstructed = new Qt3DRender::QRenderTargetSelector(); @@ -74,7 +74,7 @@ private Q_SLOTS: Qt3DRender::QRenderTarget *target2 = new Qt3DRender::QRenderTarget(); renderTargetSelectorWithTargetAndBuffers->setTarget(target2); QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> attachmentPoints = QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>() << Qt3DRender::QRenderTargetOutput::Color0 << Qt3DRender::QRenderTargetOutput::Depth; - renderTargetSelectorWithTargetAndBuffers->setDrawBuffers(attachmentPoints); + renderTargetSelectorWithTargetAndBuffers->setOutputs(attachmentPoints); QTest::newRow("renderTargetSelectorWithTargetAndDrawBuffers") << renderTargetSelectorWithTargetAndBuffers << attachmentPoints << target2; } @@ -82,11 +82,11 @@ private Q_SLOTS: { // GIVEN QFETCH(Qt3DRender::QRenderTargetSelector*, renderTargetSelector); - QFETCH(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>, drawBuffers); + QFETCH(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>, outputs); QFETCH(Qt3DRender::QRenderTarget *, target); // THEN - QCOMPARE(renderTargetSelector->drawBuffers(), drawBuffers); + QCOMPARE(renderTargetSelector->outputs(), outputs); QCOMPARE(renderTargetSelector->target(), target); // WHEN @@ -96,7 +96,7 @@ private Q_SLOTS: QVERIFY(clone != Q_NULLPTR); QCOMPARE(renderTargetSelector->id(), clone->id()); - QCOMPARE(renderTargetSelector->drawBuffers(), clone->drawBuffers()); + QCOMPARE(renderTargetSelector->outputs(), clone->outputs()); if (renderTargetSelector->target() != Q_NULLPTR) { QVERIFY(clone->target() != Q_NULLPTR); @@ -150,36 +150,36 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> drawBuffers; - drawBuffers << Qt3DRender::QRenderTargetOutput::Color0 << Qt3DRender::QRenderTargetOutput::Depth; - renderTargetSelector->setDrawBuffers(drawBuffers); + QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> outputs; + outputs << Qt3DRender::QRenderTargetOutput::Color0 << Qt3DRender::QRenderTargetOutput::Depth; + renderTargetSelector->setOutputs(outputs); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "drawBuffers"); + QCOMPARE(change->propertyName(), "outputs"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); - QCOMPARE(change->value().value<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), drawBuffers); + QCOMPARE(change->value().value<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), outputs); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); arbiter.events.clear(); // WHEN - renderTargetSelector->setDrawBuffers(drawBuffers); + renderTargetSelector->setOutputs(outputs); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 0); // WHEN - renderTargetSelector->setDrawBuffers(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>()); + renderTargetSelector->setOutputs(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>()); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "drawBuffers"); + QCOMPARE(change->propertyName(), "outputs"); QCOMPARE(change->subjectId(), renderTargetSelector->id()); QCOMPARE(change->value().value<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>()); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); |