summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-09-06 16:14:29 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-10-13 08:55:14 +0000
commit1e1ca967bc6ae5e6c4d3d419fb132cd154a29dfc (patch)
treef5deb232dee90be9134da6506d5b7f9f5f5ecaff /tests
parentafe61871b617a57ea2e42b36a6918ee9dcb6e99a (diff)
RenderAttribute -> Attribute
Change-Id: I459cd73f92931002c69d5f8fa8c19880e9149d25 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/render/attribute/attribute.pro (renamed from tests/auto/render/renderattribute/renderattribute.pro)5
-rw-r--r--tests/auto/render/attribute/tst_attribute.cpp (renamed from tests/auto/render/renderattribute/tst_renderattribute.cpp)14
-rw-r--r--tests/auto/render/render.pro2
3 files changed, 11 insertions, 10 deletions
diff --git a/tests/auto/render/renderattribute/renderattribute.pro b/tests/auto/render/attribute/attribute.pro
index b4268f98f..3ca4643d4 100644
--- a/tests/auto/render/renderattribute/renderattribute.pro
+++ b/tests/auto/render/attribute/attribute.pro
@@ -1,9 +1,10 @@
TEMPLATE = app
-TARGET = tst_renderattribute
+TARGET = tst_attribute
QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
CONFIG += testcase
-SOURCES += tst_renderattribute.cpp
+SOURCES += \
+ tst_attribute.cpp
diff --git a/tests/auto/render/renderattribute/tst_renderattribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp
index 892a33a38..d2058f1b9 100644
--- a/tests/auto/render/renderattribute/tst_renderattribute.cpp
+++ b/tests/auto/render/attribute/tst_attribute.cpp
@@ -35,11 +35,11 @@
****************************************************************************/
#include <QtTest/QTest>
-#include <Qt3DRenderer/private/renderattribute_p.h>
+#include <Qt3DRenderer/private/attribute_p.h>
#include <Qt3DRenderer/qbuffer.h>
#include <Qt3DCore/qscenepropertychange.h>
-class tst_RenderAttribute : public QObject
+class tst_Attribute : public QObject
{
Q_OBJECT
private Q_SLOTS:
@@ -47,7 +47,7 @@ private Q_SLOTS:
void checkPeerPropertyMirroring()
{
// GIVEN
- Qt3DRender::Render::RenderAttribute renderAttribute;
+ Qt3DRender::Render::Attribute renderAttribute;
Qt3DRender::QAttribute attribute;
attribute.setAttributeType(Qt3DRender::QAttribute::IndexAttribute);
@@ -84,7 +84,7 @@ private Q_SLOTS:
void checkInitialAndCleanedUpState()
{
// GIVEN
- Qt3DRender::Render::RenderAttribute renderAttribute;
+ Qt3DRender::Render::Attribute renderAttribute;
// THEN
QVERIFY(renderAttribute.peerUuid().isNull());
@@ -135,7 +135,7 @@ private Q_SLOTS:
void checkPropertyChanges()
{
// GIVEN
- Qt3DRender::Render::RenderAttribute renderAttribute;
+ Qt3DRender::Render::Attribute renderAttribute;
QVERIFY(!renderAttribute.isDirty());
@@ -273,6 +273,6 @@ private Q_SLOTS:
};
-QTEST_APPLESS_MAIN(tst_RenderAttribute)
+QTEST_APPLESS_MAIN(tst_Attribute)
-#include "tst_renderattribute.moc"
+#include "tst_attribute.moc"
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index f9bf2b7d4..f34f885ec 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -18,7 +18,7 @@ contains(QT_CONFIG, private_tests) {
qgeometry \
qgeometryrenderer \
renderbuffer \
- renderattribute \
+ attribute \
rendergeometry \
rendergeometryrenderer \
raycasting