[neurun] Use MockNode.h in verifier TC (#2772)

This commit makes the verifier TC uses `MockNode.h`.

Signed-off-by: sjsujinkim <sjsujin.kim@samsung.com>

diff --git a/runtimes/neurun/test/graph/operation/MockNode.h b/runtimes/neurun/test/graph/MockNode.h
similarity index 84%
rename from runtimes/neurun/test/graph/operation/MockNode.h
rename to runtimes/neurun/test/graph/MockNode.h
index 9456b97..589ccb5 100644 (file)
--- a/runtimes/neurun/test/graph/operation/MockNode.h
+++ b/runtimes/neurun/test/graph/MockNode.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __NEURUN_TEST_GRAPH_OPERATION_MOCK_NODE_H__
-#define __NEURUN_TEST_GRAPH_OPERATION_MOCK_NODE_H__
+#ifndef __NEURUN_TEST_GRAPH_MOCK_NODE_H__
+#define __NEURUN_TEST_GRAPH_MOCK_NODE_H__
 
 #include "graph/operation/Node.h"
 #include "graph/operand/IndexSet.h"
@@ -24,8 +24,6 @@ namespace neurun_test
 {
 namespace graph
 {
-namespace operation
-{
 
 class SimpleMockNode : public neurun::graph::operation::Node
 {
@@ -41,8 +39,7 @@ public:
   virtual void accept(neurun::graph::operation::NodeVisitor &&) const override {}
 };
 
-} // namespace operation
 } // namespace graph
 } // namespace neurun_test
 
-#endif // __NEURUN_TEST_GRAPH_OPERATION_MOCK_NODE_H__
+#endif // __NEURUN_TEST_GRAPH_MOCK_NODE_H__

diff --git a/runtimes/neurun/test/graph/operand/UseDef.cc b/runtimes/neurun/test/graph/operand/UseDef.cc
index caaea1f..1a2e6d7 100644 (file)
--- a/runtimes/neurun/test/graph/operand/UseDef.cc
+++ b/runtimes/neurun/test/graph/operand/UseDef.cc
@@ -19,7 +19,7 @@
 #include "graph/Graph.h"
 #include "graph/verifier/IVerifier.h"
 #include "nnfw/std/memory.h"
-#include "../operation/MockNode.h"
+#include "../MockNode.h"
 
 #include <typeindex>
 
@@ -27,7 +27,7 @@ namespace
 {
 
 using IndexSet = neurun::graph::operand::IndexSet;
-using MockNode = neurun_test::graph::operation::SimpleMockNode;
+using MockNode = neurun_test::graph::SimpleMockNode;
 
 } // namespace anonymous
 

diff --git a/runtimes/neurun/test/graph/operation/Insert.cc b/runtimes/neurun/test/graph/operation/Insert.cc
index dab89c2..1b9995f 100644 (file)
--- a/runtimes/neurun/test/graph/operation/Insert.cc
+++ b/runtimes/neurun/test/graph/operation/Insert.cc
@@ -20,14 +20,14 @@
 #include "graph/verifier/IVerifier.h"
 #include "nnfw/std/memory.h"
 #include "graph/operand/Index.h"
-#include "MockNode.h"
+#include "../MockNode.h"
 
 #include <typeindex>
 
 using IOIndex = neurun::graph::operand::IO::Index;
 using Index = neurun::graph::operand::Index;
 using IndexSet = neurun::graph::operand::IndexSet;
-using MockNode = neurun_test::graph::operation::SimpleMockNode;
+using MockNode = neurun_test::graph::SimpleMockNode;
 
 TEST(graph_operation_manipulation, operation_insertion)
 {

diff --git a/runtimes/neurun/test/graph/operation/Set.cc b/runtimes/neurun/test/graph/operation/Set.cc
index df680ff..9fee441 100644 (file)
--- a/runtimes/neurun/test/graph/operation/Set.cc
+++ b/runtimes/neurun/test/graph/operation/Set.cc
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "MockNode.h"
+#include "../MockNode.h"
 #include "graph/operation/Set.h"
 
 using neurun::graph::operation::Set;
@@ -26,8 +26,8 @@ using neurun::graph::operation::Index;
 TEST(graph_operation_Set, operation_test)
 {
   Set set;
-  set.append(std::unique_ptr<Node>(
-      new neurun_test::graph::operation::SimpleMockNode({1, 2, 3, 4}, {5, 6, 7})));
+  set.append(
+      std::unique_ptr<Node>(new neurun_test::graph::SimpleMockNode({1, 2, 3, 4}, {5, 6, 7})));
   Index idx{0u};
   ASSERT_EQ(set.at(idx).getInputs().size(), 4);
   ASSERT_EQ(set.at(idx).getOutputs().size(), 3);

diff --git a/runtimes/neurun/test/graph/verifier/Verifier.cc b/runtimes/neurun/test/graph/verifier/Verifier.cc
index 68c8e8e..219ac1d 100644 (file)
--- a/runtimes/neurun/test/graph/verifier/Verifier.cc
+++ b/runtimes/neurun/test/graph/verifier/Verifier.cc
@@ -21,19 +21,10 @@
 #include "graph/verifier/IVerifier.h"
 #include "nnfw/std/memory.h"
 #include "graph/operand/Object.h"
+#include "../MockNode.h"
 
-class MockNode : public neurun::graph::operation::Node
-{
-public:
-  MockNode(const neurun::graph::operand::Index &input, const neurun::graph::operand::Index &output)
-  {
-    setInputs({input});
-    setOutputs({output});
-  }
-
-public:
-  virtual void accept(neurun::graph::operation::NodeVisitor &&) const override {}
-};
+using IndexSet = neurun::graph::operand::IndexSet;
+using MockNode = neurun_test::graph::SimpleMockNode;
 
 TEST(Verifier, dag_checker)
 {
@@ -52,13 +43,13 @@ TEST(Verifier, dag_checker)
   graph.addOutput(operand2);
   graph.operands().at(operand2).setAsOperationOutput();
 
-  graph.addOperation(nnfw::make_unique<MockNode>(operand1, operand2));
+  graph.addOperation(nnfw::make_unique<MockNode>(IndexSet{operand1}, IndexSet{operand2}));
 
   ASSERT_EQ(verifier.verify(graph), true);
 
   // Create cycle
   graph.operands().at(operand1).setAsOperationOutput();
-  graph.addOperation(nnfw::make_unique<MockNode>(operand2, operand1));
+  graph.addOperation(nnfw::make_unique<MockNode>(IndexSet{operand2}, IndexSet{operand1}));
 
   ASSERT_EQ(verifier.verify(graph), false);
 }