From 32281653bf3564afe075fd684365b640082c695f Mon Sep 17 00:00:00 2001
From: Kevin Ottens <kevin.ottens@kdab.com>
Date: Tue, 18 Jul 2017 11:39:13 +0200
Subject: Add the layer concept to QShaderNode and QShaderGraph::Edge

This will be used in further commits

Change-Id: I49977f1ea482b97dc0a159f69a0d2eda3865ec44
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp | 7 +++++--
 tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp b/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp
index b2a9d99b19..25b45f7fa6 100644
--- a/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp
+++ b/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp
@@ -41,23 +41,26 @@ namespace
         return port;
     }
 
-    QShaderNode createNode(const QVector<QShaderNodePort> &ports)
+    QShaderNode createNode(const QVector<QShaderNodePort> &ports, const QStringList &layers = QStringList())
     {
         auto node = QShaderNode();
         node.setUuid(QUuid::createUuid());
+        node.setLayers(layers);
         for (const auto &port : ports)
             node.addPort(port);
         return node;
     }
 
     QShaderGraph::Edge createEdge(const QUuid &sourceUuid, const QString &sourceName,
-                                  const QUuid &targetUuid, const QString &targetName)
+                                  const QUuid &targetUuid, const QString &targetName,
+                                  const QStringList &layers = QStringList())
     {
         auto edge = QShaderGraph::Edge();
         edge.sourceNodeUuid = sourceUuid;
         edge.sourcePortName = sourceName;
         edge.targetNodeUuid = targetUuid;
         edge.targetPortName = targetName;
+        edge.layers = layers;
         return edge;
     }
 
diff --git a/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp b/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp
index 0280f6559b..9eb738a1b2 100644
--- a/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp
+++ b/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp
@@ -351,6 +351,7 @@ void tst_QShaderNodes::shouldManipulateNodeMembers()
     // THEN (default state)
     QCOMPARE(node.type(), QShaderNode::Invalid);
     QVERIFY(node.uuid().isNull());
+    QVERIFY(node.layers().isEmpty());
     QVERIFY(node.ports().isEmpty());
     QVERIFY(node.parameterNames().isEmpty());
     QVERIFY(node.availableFormats().isEmpty());
@@ -362,6 +363,12 @@ void tst_QShaderNodes::shouldManipulateNodeMembers()
     // THEN
     QCOMPARE(node.uuid(), uuid);
 
+    // WHEN
+    node.setLayers({"foo", "bar"});
+
+    // THEN
+    QCOMPARE(node.layers(), QStringList({"foo", "bar"}));
+
     // WHEN
     auto firstPort = QShaderNodePort();
     firstPort.direction = QShaderNodePort::Input;
-- 
cgit v1.2.3