From 25ab3a8326a9e2c52c84b2747fa72907109a695d Mon Sep 17 00:00:00 2001
From: Colm Donelan <Colm.Donelan@arm.com>
Date: Mon, 17 May 2021 13:01:52 +0100
Subject: IVGCVSW-5964 Removing some remaining boost utility usages from tests.

* Adding a basic PredicateResult class to replace
  boost::test_tools::predicate_result
* Replacing all uses of boost::test_tools::predicate_result with
  the new armnn::PredicateResult class
* Replacing use of boost::test_tools::output_test_stream output
  with std::ostringstream in ProfilerTests.cpp

Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: I75cdbbff98d984e26e4a50c125386b2988516fad
---
 .../aclCommon/test/CreateWorkloadClNeon.hpp        | 22 ++++++++++++----------
 src/backends/aclCommon/test/MemCopyTests.cpp       | 12 ++++++++----
 2 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'src/backends/aclCommon/test')

diff --git a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
index b14e148287..0a30907f55 100644
--- a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
+++ b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <test/CreateWorkload.hpp>
-
+#include <test/PredicateResult.hpp>
 #include <armnn/utility/PolymorphicDowncast.hpp>
 #include <backendsCommon/MemCopyWorkload.hpp>
 #include <reference/RefWorkloadFactory.hpp>
@@ -27,8 +27,8 @@ namespace
 using namespace std;
 
 template<typename IComputeTensorHandle>
-boost::test_tools::predicate_result CompareTensorHandleShape(IComputeTensorHandle*               tensorHandle,
-                                                             std::initializer_list<unsigned int> expectedDimensions)
+PredicateResult CompareTensorHandleShape(IComputeTensorHandle* tensorHandle,
+                                         std::initializer_list<unsigned int> expectedDimensions)
 {
     arm_compute::ITensorInfo* info = tensorHandle->GetTensor().info();
 
@@ -36,8 +36,8 @@ boost::test_tools::predicate_result CompareTensorHandleShape(IComputeTensorHandl
     auto numExpectedDims = expectedDimensions.size();
     if (infoNumDims != numExpectedDims)
     {
-        boost::test_tools::predicate_result res(false);
-        res.message() << "Different number of dimensions [" << info->num_dimensions()
+        PredicateResult res(false);
+        res.Message() << "Different number of dimensions [" << info->num_dimensions()
                       << "!=" << expectedDimensions.size() << "]";
         return res;
     }
@@ -48,8 +48,8 @@ boost::test_tools::predicate_result CompareTensorHandleShape(IComputeTensorHandl
     {
         if (info->dimension(i) != expectedDimension)
         {
-            boost::test_tools::predicate_result res(false);
-            res.message() << "For dimension " << i <<
+            PredicateResult res(false);
+            res.Message() << "For dimension " << i <<
                              " expected size " << expectedDimension <<
                              " got " << info->dimension(i);
             return res;
@@ -58,7 +58,7 @@ boost::test_tools::predicate_result CompareTensorHandleShape(IComputeTensorHandl
         i--;
     }
 
-    return true;
+    return PredicateResult(true);
 }
 
 template<typename IComputeTensorHandle>
@@ -97,7 +97,8 @@ void CreateMemCopyWorkloads(IWorkloadFactory& factory)
     auto inputHandle1  = PolymorphicDowncast<RefTensorHandle*>(queueDescriptor1.m_Inputs[0]);
     auto outputHandle1 = PolymorphicDowncast<IComputeTensorHandle*>(queueDescriptor1.m_Outputs[0]);
     BOOST_TEST((inputHandle1->GetTensorInfo() == TensorInfo({2, 3}, DataType::Float32)));
-    BOOST_TEST(CompareTensorHandleShape<IComputeTensorHandle>(outputHandle1, {2, 3}));
+    auto result = CompareTensorHandleShape<IComputeTensorHandle>(outputHandle1, {2, 3});
+    BOOST_TEST(result.m_Result, result.m_Message.str());
 
 
     MemCopyQueueDescriptor queueDescriptor2 = workload2->GetData();
@@ -105,7 +106,8 @@ void CreateMemCopyWorkloads(IWorkloadFactory& factory)
     BOOST_TEST(queueDescriptor2.m_Outputs.size() == 1);
     auto inputHandle2  = PolymorphicDowncast<IComputeTensorHandle*>(queueDescriptor2.m_Inputs[0]);
     auto outputHandle2 = PolymorphicDowncast<RefTensorHandle*>(queueDescriptor2.m_Outputs[0]);
-    BOOST_TEST(CompareTensorHandleShape<IComputeTensorHandle>(inputHandle2, {2, 3}));
+    result = CompareTensorHandleShape<IComputeTensorHandle>(inputHandle2, {2, 3});
+    BOOST_TEST(result.m_Result, result.m_Message.str());
     BOOST_TEST((outputHandle2->GetTensorInfo() == TensorInfo({2, 3}, DataType::Float32)));
 }
 
diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp
index 3e26364354..ffba19323a 100644
--- a/src/backends/aclCommon/test/MemCopyTests.cpp
+++ b/src/backends/aclCommon/test/MemCopyTests.cpp
@@ -48,28 +48,32 @@ BOOST_AUTO_TEST_CASE(CopyBetweenNeonAndGpu)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::NeonWorkloadFactory, armnn::ClWorkloadFactory, armnn::DataType::Float32>(false);
-    BOOST_TEST(CompareTensors(result.output, result.outputExpected));
+    auto predResult = CompareTensors(result.output, result.outputExpected);
+    BOOST_TEST(predResult.m_Result, predResult.m_Message.str());
 }
 
 BOOST_AUTO_TEST_CASE(CopyBetweenGpuAndNeon)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::ClWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(false);
-    BOOST_TEST(CompareTensors(result.output, result.outputExpected));
+    auto predResult = CompareTensors(result.output, result.outputExpected);
+    BOOST_TEST(predResult.m_Result, predResult.m_Message.str());
 }
 
 BOOST_AUTO_TEST_CASE(CopyBetweenNeonAndGpuWithSubtensors)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::NeonWorkloadFactory, armnn::ClWorkloadFactory, armnn::DataType::Float32>(true);
-    BOOST_TEST(CompareTensors(result.output, result.outputExpected));
+    auto predResult = CompareTensors(result.output, result.outputExpected);
+    BOOST_TEST(predResult.m_Result, predResult.m_Message.str());
 }
 
 BOOST_AUTO_TEST_CASE(CopyBetweenGpuAndNeonWithSubtensors)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::ClWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(true);
-    BOOST_TEST(CompareTensors(result.output, result.outputExpected));
+    auto predResult = CompareTensors(result.output, result.outputExpected);
+    BOOST_TEST(predResult.m_Result, predResult.m_Message.str());
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-- 
cgit v1.2.1