IVGCVSW-3267 Add more code coverage to the PReLU layer

 * Added more unit tests to cover all code branches
 * Moved the InferOutput tests to separate files
 * Created convenience ARMNN_SIMPLE_TEST_CASE macro
 * Created TestUtils file for common utility functions

Change-Id: Id971d3cf77005397d1f0b2783fab68b1f0bf9dfc
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>

1 files changed, 6 insertions, 9 deletions

diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp
index b0d8629c7f..97bd8de651 100644
--- a/src/armnn/test/OptimizerTests.cpp
+++ b/src/armnn/test/OptimizerTests.cpp
@@ -2,7 +2,8 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
-#include <boost/test/unit_test.hpp>
+
+#include "TestUtils.hpp"
 
 #include <armnn/ArmNN.hpp>
 #include <Graph.hpp>
@@ -10,6 +11,10 @@
 #include <backendsCommon/CpuTensorHandle.hpp>
 #include <FloatingPointConverter.hpp>
 
+#include <boost/test/unit_test.hpp>
+
+using namespace armnn;
+
 namespace
 {
 template <typename LayerT>
@@ -52,14 +57,6 @@ bool CheckRelatedLayers(armnn::Graph& graph, const std::list<std::string>& testR
     return true;
 }
 
-// connects two layers
-using namespace armnn;
-void Connect(Layer* from, Layer* to, const TensorInfo& tensorInfo, unsigned int fromIndex = 0, unsigned int toIndex = 0)
-{
-    from->GetOutputSlot(fromIndex).Connect(to->GetInputSlot(toIndex));
-    from->GetOutputHandler(fromIndex).SetTensorInfo(tensorInfo);
-}
-
 void CreateLSTMLayerHelper(Graph &graph, bool CifgEnabled)
 {
     LstmDescriptor layerDesc;