1 files changed, 42 insertions, 221 deletions
diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.cpp b/src/armnn/test/TestNameOnlyLayerVisitor.cpp
index c4c4a479eb..c738caeb1f 100644
--- a/src/armnn/test/TestNameOnlyLayerVisitor.cpp
+++ b/src/armnn/test/TestNameOnlyLayerVisitor.cpp
@@ -2,242 +2,63 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
-#include <boost/test/unit_test.hpp>
-#include "TestNameOnlyLayerVisitor.hpp"
-#include "Network.hpp"
-
-namespace armnn {
-
-BOOST_AUTO_TEST_SUITE(TestNameOnlyLayerVisitor)
-
-// Addition
-BOOST_AUTO_TEST_CASE(CheckAdditionLayerVisitorName)
-{
-    TestAdditionLayerVisitor visitor("AdditionLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddAdditionLayer("AdditionLayer");
-    layer->Accept(visitor);
-}
-
-BOOST_AUTO_TEST_CASE(CheckAdditionLayerVisitorNameNullptr)
-{
-    TestAdditionLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddAdditionLayer();
-    layer->Accept(visitor);
-}
-
-// Division
-BOOST_AUTO_TEST_CASE(CheckDivisionLayerVisitorName)
-{
-    TestDivisionLayerVisitor visitor("DivisionLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddAdditionLayer("DivisionLayer");
-    layer->Accept(visitor);
-}
-
-BOOST_AUTO_TEST_CASE(CheckDivisionLayerVisitorNameNullptr)
-{
-    TestDivisionLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddDivisionLayer();
-    layer->Accept(visitor);
-}
-
-// Equal
-BOOST_AUTO_TEST_CASE(CheckEqualLayerVisitorName)
-{
-    TestEqualLayerVisitor visitor("EqualLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddEqualLayer("EqualLayer");
-    layer->Accept(visitor);
-}
-
-BOOST_AUTO_TEST_CASE(CheckEqualLayerVisitorNameNullptr)
-{
-    TestEqualLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddEqualLayer();
-    layer->Accept(visitor);
-}
-
-// Floor
-BOOST_AUTO_TEST_CASE(CheckFloorLayerVisitorName)
-{
-    TestFloorLayerVisitor visitor("FloorLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddFloorLayer("FloorLayer");
-    layer->Accept(visitor);
-}
-
-BOOST_AUTO_TEST_CASE(CheckFloorLayerVisitorNameNullptr)
-{
-    TestFloorLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddFloorLayer();
-    layer->Accept(visitor);
-}
-
-// Gather
-BOOST_AUTO_TEST_CASE(CheckGatherLayerVisitorName)
-{
-    TestGatherLayerVisitor visitor("GatherLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddGatherLayer("GatherLayer");
-    layer->Accept(visitor);
-}
-
-BOOST_AUTO_TEST_CASE(CheckGatherLayerVisitorNameNullptr)
-{
-    TestGatherLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddGatherLayer();
-    layer->Accept(visitor);
-}
 
-// Greater
-BOOST_AUTO_TEST_CASE(CheckGreaterLayerVisitorName)
-{
-    TestGreaterLayerVisitor visitor("GreaterLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddGreaterLayer("GreaterLayer");
-    layer->Accept(visitor);
-}
-
-BOOST_AUTO_TEST_CASE(CheckGreaterLayerVisitorNameNullptr)
-{
-    TestGreaterLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddGreaterLayer();
-    layer->Accept(visitor);
-}
-
-// Maximum
-BOOST_AUTO_TEST_CASE(CheckMaximumLayerVisitorName)
-{
-    TestMaximumLayerVisitor visitor("MaximumLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddMaximumLayer("MaximumLayer");
-    layer->Accept(visitor);
-}
-
-BOOST_AUTO_TEST_CASE(CheckMaximumLayerVisitorNameNullptr)
-{
-    TestMaximumLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddMaximumLayer();
-    layer->Accept(visitor);
-}
-
-// Minimum
-BOOST_AUTO_TEST_CASE(CheckMinimumLayerVisitorName)
-{
-    TestMinimumLayerVisitor visitor("MinimumLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddMinimumLayer("MinimumLayer");
-    layer->Accept(visitor);
-}
-
-BOOST_AUTO_TEST_CASE(CheckMinimumLayerVisitorNameNullptr)
-{
-    TestMinimumLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddMinimumLayer();
-    layer->Accept(visitor);
-}
-
-// Multiplication
-BOOST_AUTO_TEST_CASE(CheckMultiplicationLayerVisitorName)
-{
-    TestMultiplicationLayerVisitor visitor("MultiplicationLayer");
-    Network net;
+#include "TestNameOnlyLayerVisitor.hpp"
 
-    IConnectableLayer *const layer = net.AddMultiplicationLayer("MultiplicationLayer");
-    layer->Accept(visitor);
-}
+#include <Network.hpp>
 
-BOOST_AUTO_TEST_CASE(CheckMultiplicationLayerVisitorNameNullptr)
-{
-    TestMultiplicationLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddMultiplicationLayer();
-    layer->Accept(visitor);
-}
+#include <boost/test/unit_test.hpp>
 
-// Rsqrt
-BOOST_AUTO_TEST_CASE(CheckRsqrtLayerVisitorName)
+namespace
 {
-    TestRsqrtLayerVisitor visitor("RsqrtLayer");
-    Network net;
-
-    IConnectableLayer *const layer = net.AddRsqrtLayer("RsqrtLayer");
-    layer->Accept(visitor);
-}
 
-BOOST_AUTO_TEST_CASE(CheckRsqrtLayerVisitorNameNullptr)
-{
-    TestRsqrtLayerVisitor visitor;
-    Network net;
+#define ADD_LAYER_METHOD_1_PARAM(name) net.Add##name##Layer("name##Layer")
+#define ADD_LAYER_METHOD_2_PARAM(name) net.Add##name##Layer(armnn::name##Descriptor(), "name##Layer")
 
-    IConnectableLayer *const layer = net.AddRsqrtLayer();
-    layer->Accept(visitor);
+#define TEST_CASE_CHECK_LAYER_VISITOR_NAME(name, numParams) \
+BOOST_AUTO_TEST_CASE(Check##name##LayerVisitorName) \
+{ \
+    Test##name##LayerVisitor visitor("name##Layer"); \
+    armnn::Network net; \
+    armnn::IConnectableLayer *const layer = ADD_LAYER_METHOD_##numParams##_PARAM(name); \
+    layer->Accept(visitor); \
 }
 
-// Slice
-BOOST_AUTO_TEST_CASE(CheckSliceLayerVisitorName)
-{
-    TestSliceLayerVisitor visitor("SliceLayer");
-    Network net;
+#define ADD_LAYER_METHOD_NULLPTR_1_PARAM(name) net.Add##name##Layer()
+#define ADD_LAYER_METHOD_NULLPTR_2_PARAM(name) net.Add##name##Layer(armnn::name##Descriptor())
 
-    IConnectableLayer *const layer = net.AddSliceLayer(SliceDescriptor(), "SliceLayer");
-    layer->Accept(visitor);
+#define TEST_CASE_CHECK_LAYER_VISITOR_NAME_NULLPTR(name, numParams) \
+BOOST_AUTO_TEST_CASE(Check##name##LayerVisitorNameNullptr) \
+{ \
+    Test##name##LayerVisitor visitor; \
+    armnn::Network net; \
+    armnn::IConnectableLayer *const layer = ADD_LAYER_METHOD_NULLPTR_##numParams##_PARAM(name); \
+    layer->Accept(visitor); \
 }
 
-BOOST_AUTO_TEST_CASE(CheckSliceLayerVisitorNameNullptr)
-{
-    TestSliceLayerVisitor visitor;
-    Network net;
+#define TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(name) \
+TEST_CASE_CHECK_LAYER_VISITOR_NAME(name, 1) \
+TEST_CASE_CHECK_LAYER_VISITOR_NAME_NULLPTR(name, 1)
 
-    IConnectableLayer *const layer = net.AddSliceLayer(SliceDescriptor());
-    layer->Accept(visitor);
-}
+#define TEST_SUITE_NAME_ONLY_LAYER_VISITOR_2_PARAM(name) \
+TEST_CASE_CHECK_LAYER_VISITOR_NAME(name, 2) \
+TEST_CASE_CHECK_LAYER_VISITOR_NAME_NULLPTR(name, 2)
 
-// Subtraction
-BOOST_AUTO_TEST_CASE(CheckSubtractionLayerVisitorName)
-{
-    TestSubtractionLayerVisitor visitor("SubtractionLayer");
-    Network net;
+} // anonymous namespace
 
-    IConnectableLayer *const layer = net.AddSubtractionLayer("SubtractionLayer");
-    layer->Accept(visitor);
-}
+BOOST_AUTO_TEST_SUITE(TestNameOnlyLayerVisitor)
 
-BOOST_AUTO_TEST_CASE(CheckSubtractionLayerVisitorNameNullptr)
-{
-    TestSubtractionLayerVisitor visitor;
-    Network net;
-
-    IConnectableLayer *const layer = net.AddSubtractionLayer();
-    layer->Accept(visitor);
-}
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Addition)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Division)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Equal)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Floor)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Gather)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Greater)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Maximum)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Minimum)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Multiplication)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Rsqrt)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_2_PARAM(Slice)
+TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Subtraction)
 
 BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace armnn