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

2 files changed, 16 insertions, 8 deletions

diff --git a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp
index f68082762c..c6636554ea 100644
--- a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp
+++ b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp
@@ -225,10 +225,14 @@ void DetectionPostProcessImpl(const armnn::TensorInfo& boxEncodingsInfo,
     CopyDataFromITensorHandle(detectionScoresResult.output.origin(), outputScoresHandle.get());
     CopyDataFromITensorHandle(numDetectionsResult.output.origin(), numDetectionHandle.get());
 
-    BOOST_TEST(CompareTensors(detectionBoxesResult.output, detectionBoxesResult.outputExpected));
-    BOOST_TEST(CompareTensors(detectionClassesResult.output, detectionClassesResult.outputExpected));
-    BOOST_TEST(CompareTensors(detectionScoresResult.output, detectionScoresResult.outputExpected));
-    BOOST_TEST(CompareTensors(numDetectionsResult.output, numDetectionsResult.outputExpected));
+    auto result = CompareTensors(detectionBoxesResult.output, detectionBoxesResult.outputExpected);
+    BOOST_TEST(result.m_Result, result.m_Message.str());
+    result = CompareTensors(detectionClassesResult.output, detectionClassesResult.outputExpected);
+    BOOST_TEST(result.m_Result, result.m_Message.str());
+    result = CompareTensors(detectionScoresResult.output, detectionScoresResult.outputExpected);
+    BOOST_TEST(result.m_Result, result.m_Message.str());
+    result = CompareTensors(numDetectionsResult.output, numDetectionsResult.outputExpected);
+    BOOST_TEST(result.m_Result, result.m_Message.str());
 }
 
 template<armnn::DataType QuantizedType, typename RawType = armnn::ResolveType<QuantizedType>>
diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp
index 7a9652a8ea..1c63542dcb 100644
--- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp
@@ -45,7 +45,8 @@ void LstmUtilsVectorBatchVectorAddTestImpl(
     VectorBatchVectorAdd(*vecDecoder, vSize, *batchVecDecoder, nBatch, *batchVecEncoder);
 
     // check shape and compare values
-    BOOST_TEST(CompareTensors(batchVec, expectedOutput));
+    auto result = CompareTensors(batchVec, expectedOutput);
+    BOOST_TEST(result.m_Result, result.m_Message.str());
 
     // check if iterator is back at start position
     batchVecEncoder->Set(1.0f);
@@ -70,7 +71,8 @@ void LstmUtilsZeroVectorTestImpl(
     ZeroVector(*outputEncoder, vSize);
 
     // check shape and compare values
-    BOOST_TEST(CompareTensors(input, expectedOutput));
+    auto result = CompareTensors(input, expectedOutput);
+    BOOST_TEST(result.m_Result, result.m_Message.str());
 
     // check if iterator is back at start position
     outputEncoder->Set(1.0f);
@@ -96,7 +98,8 @@ void LstmUtilsMeanStddevNormalizationTestImpl(
     MeanStddevNormalization(*inputDecoder, *outputEncoder, vSize, nBatch, 1e-8f);
 
     // check shape and compare values
-    BOOST_TEST(CompareTensors(input, expectedOutput));
+    auto result = CompareTensors(input, expectedOutput);
+    BOOST_TEST(result.m_Result, result.m_Message.str());
 
     // check if iterator is back at start position
     outputEncoder->Set(1.0f);
@@ -123,7 +126,8 @@ void LstmUtilsVectorBatchVectorCwiseProductTestImpl(
     VectorBatchVectorCwiseProduct(*vecDecoder, vSize, *batchVecDecoder, nBatch, *batchVecEncoder);
 
     // check shape and compare values
-    BOOST_TEST(CompareTensors(batchVec, expectedOutput));
+    auto result = CompareTensors(batchVec, expectedOutput);
+    BOOST_TEST(result.m_Result, result.m_Message.str());
 
     // check if iterator is back at start position
     batchVecEncoder->Set(1.0f);