From a02e859b084c542bba472a4ae6f22acad07b085c Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Sat, 4 Mar 2017 13:58:51 +0000 Subject: Use using namespace Qt3DAnimation::Animation in tst_clipblendnode Reduces visual clutter Change-Id: I807adbdabc2c010f0b33a7ebf89f7aeeaabd5b6d Reviewed-by: Mike Krus --- .../animation/clipblendnode/tst_clipblendnode.cpp | 48 ++++++++++++---------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'tests') diff --git a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp index 7d9345775..7174dff54 100644 --- a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp +++ b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp @@ -42,18 +42,20 @@ #include #include +using namespace Qt3DAnimation::Animation; + namespace { -class TestClipBlendNode : public Qt3DAnimation::Animation::ClipBlendNode +class TestClipBlendNode : public ClipBlendNode { public: TestClipBlendNode() - : Qt3DAnimation::Animation::ClipBlendNode(Qt3DAnimation::Animation::ClipBlendNode::LerpBlendType) + : ClipBlendNode(ClipBlendNode::LerpBlendType) {} float blend(float , float ) const Q_DECL_FINAL { return 0.0f; } - using Qt3DAnimation::Animation::ClipBlendNode::setClipResults; + using ClipBlendNode::setClipResults; }; } // anonymous @@ -78,8 +80,8 @@ private Q_SLOTS: QCOMPARE(backendClipBlendNode.parentId(), Qt3DCore::QNodeId()); QCOMPARE(backendClipBlendNode.childrenIds(), Qt3DCore::QNodeIdVector()); QVERIFY(backendClipBlendNode.clipBlendNodeManager() == nullptr); - QCOMPARE(backendClipBlendNode.blendType(), Qt3DAnimation::Animation::ClipBlendNode::LerpBlendType); - QCOMPARE(backendClipBlendNode.clipResults(Qt3DCore::QNodeId()), Qt3DAnimation::Animation::ClipResults()); + QCOMPARE(backendClipBlendNode.blendType(), ClipBlendNode::LerpBlendType); + QCOMPARE(backendClipBlendNode.clipResults(Qt3DCore::QNodeId()), ClipResults()); } void checkInitializeFromPeer() @@ -93,7 +95,7 @@ private Q_SLOTS: { // WHEN - Qt3DAnimation::Animation::ClipBlendNodeManager manager; + ClipBlendNodeManager manager; TestClipBlendNode backendClipBlendNode; backendClipBlendNode.setClipBlendNodeManager(&manager); simulateInitialization(&clipBlendNode, &backendClipBlendNode); @@ -106,12 +108,12 @@ private Q_SLOTS: QCOMPARE(backendClipBlendNode.parentId(), Qt3DCore::QNodeId()); QCOMPARE(backendClipBlendNode.childrenIds().size(), 0); QCOMPARE(backendClipBlendNode.clipBlendNodeManager(), &manager); - QCOMPARE(backendClipBlendNode.blendType(), Qt3DAnimation::Animation::ClipBlendNode::LerpBlendType); - QCOMPARE(backendClipBlendNode.clipResults(Qt3DCore::QNodeId()), Qt3DAnimation::Animation::ClipResults()); + QCOMPARE(backendClipBlendNode.blendType(), ClipBlendNode::LerpBlendType); + QCOMPARE(backendClipBlendNode.clipResults(Qt3DCore::QNodeId()), ClipResults()); } { // WHEN - Qt3DAnimation::Animation::ClipBlendNodeManager manager; + ClipBlendNodeManager manager; TestClipBlendNode backendClipBlendNode; clipBlendNode.setEnabled(false); backendClipBlendNode.setClipBlendNodeManager(&manager); @@ -127,7 +129,7 @@ private Q_SLOTS: { // GIVEN TestClipBlendNode backendClipBlendNode; - Qt3DAnimation::Animation::ClipBlendNodeManager manager; + ClipBlendNodeManager manager; backendClipBlendNode.setClipBlendNodeManager(&manager); { // WHEN @@ -193,7 +195,7 @@ private Q_SLOTS: TestClipBlendNode *backendChildClipBlendNode = new TestClipBlendNode(); Qt3DAnimation::QLerpClipBlend clipBlendParent; Qt3DAnimation::QLerpClipBlend childClipBlend(&clipBlendParent); - Qt3DAnimation::Animation::ClipBlendNodeManager manager; + ClipBlendNodeManager manager; backendClipBlendNode->setClipBlendNodeManager(&manager); backendChildClipBlendNode->setClipBlendNodeManager(&manager); @@ -234,18 +236,20 @@ private Q_SLOTS: QTest::addColumn("blendNode"); QTest::addColumn>("indexes"); QTest::addColumn>("animatorIds"); - QTest::addColumn>("expectedClipResults"); + QTest::addColumn>("expectedClipResults"); // Single entry { auto blendNode = new TestClipBlendNode; QVector animatorIds; - QVector expectedClipResults; + QVector expectedClipResults; const auto animatorId = Qt3DCore::QNodeId::createId(); animatorIds.push_back(animatorId); - Qt3DAnimation::Animation::ClipResults clipResults = { 0.0f, 1.0f, 2.0f }; + ClipResults clipResults = { 0.0f, 1.0f, 2.0f }; + for (int i = 0; i < 3; ++i) + clipResults.push_back(float(i)); expectedClipResults.push_back(clipResults); // Set data and indexes @@ -260,12 +264,12 @@ private Q_SLOTS: { auto blendNode = new TestClipBlendNode; QVector animatorIds; - QVector expectedClipResults; + QVector expectedClipResults; auto animatorId = Qt3DCore::QNodeId::createId(); animatorIds.push_back(animatorId); - Qt3DAnimation::Animation::ClipResults clipResults; + ClipResults clipResults; expectedClipResults.push_back(clipResults); // Don't set any data @@ -279,14 +283,14 @@ private Q_SLOTS: { auto blendNode = new TestClipBlendNode; QVector animatorIds; - QVector expectedClipResults; + QVector expectedClipResults; const int animatorCount = 10; for (int j = 0; j < animatorCount; ++j) { auto animatorId = Qt3DCore::QNodeId::createId(); animatorIds.push_back(animatorId); - Qt3DAnimation::Animation::ClipResults clipResults; + ClipResults clipResults; for (int i = 0; i < j + 5; ++i) clipResults.push_back(float(i + j)); expectedClipResults.push_back(clipResults); @@ -305,14 +309,14 @@ private Q_SLOTS: { auto blendNode = new TestClipBlendNode; QVector animatorIds; - QVector expectedClipResults; + QVector expectedClipResults; const int animatorCount = 10; for (int j = 0; j < animatorCount; ++j) { auto animatorId = Qt3DCore::QNodeId::createId(); animatorIds.push_back(animatorId); - Qt3DAnimation::Animation::ClipResults clipResults; + ClipResults clipResults; for (int i = 0; i < j + 5; ++i) clipResults.push_back(float(i + j)); expectedClipResults.push_back(clipResults); @@ -338,12 +342,12 @@ private Q_SLOTS: QFETCH(TestClipBlendNode *, blendNode); QFETCH(QVector, indexes); QFETCH(QVector, animatorIds); - QFETCH(QVector, expectedClipResults); + QFETCH(QVector, expectedClipResults); for (int i = 0; i < indexes.size(); ++i) { // WHEN const int index = indexes[i]; - const Qt3DAnimation::Animation::ClipResults actualClipResults = blendNode->clipResults(animatorIds[index]); + const ClipResults actualClipResults = blendNode->clipResults(animatorIds[index]); // THEN QCOMPARE(actualClipResults.size(), expectedClipResults[index].size()); -- cgit v1.2.3