commit 4d07e5e0e2f32184e395f44cc50eedf3de284d22
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Mon Apr 06 16:46:21 2020 +0100
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Tue Apr 07 14:55:36 2020 +0000
tree 880d7a30c3d36f1892312da7ed6d04d7dbf2f040
parent dbae2476905291b82e4b9bb7828be83ae7ddd84f

IVGCVSW-4485 Remove Boost assert

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: If602024a339df7548333e470545f9400c3daf7b3

test/1.2/Capabilities.cpp

diff --git a/test/1.2/Capabilities.cpp b/test/1.2/Capabilities.cpp
index 5f81759..f25723d 100644
--- a/test/1.2/Capabilities.cpp
+++ b/test/1.2/Capabilities.cpp
@@ -7,6 +7,8 @@
 
 #include "Utils.h"
 
+#include <armnn/utility/Assert.hpp>
+
 #include <boost/test/unit_test.hpp>
 
 #include <sys/system_properties.h>
@@ -60,8 +62,8 @@
 {
     using namespace armnn_driver::hal_1_2;
     PerformanceInfo perfInfo = android::nn::lookup(capabilities.operandPerformance, type);
-    BOOST_ASSERT(perfInfo.execTime == execTime);
-    BOOST_ASSERT(perfInfo.powerUsage == powerUsage);
+    ARMNN_ASSERT(perfInfo.execTime == execTime);
+    ARMNN_ASSERT(perfInfo.powerUsage == powerUsage);
 }
 
 BOOST_FIXTURE_TEST_SUITE(CapabilitiesTests, CapabilitiesFixture)
@@ -92,7 +94,7 @@
             CheckOperandType(capabilities, V1_2::OperandType::OEM, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, V1_2::OperandType::TENSOR_OEM_BYTE, FLT_MAX, FLT_MAX);
 
-            BOOST_ASSERT(error == V1_0::ErrorStatus::NONE);
+            ARMNN_ASSERT(error == V1_0::ErrorStatus::NONE);
         };
 
     __system_property_set("Armnn.operandTypeTensorFloat32Performance.execTime", "2.0f");
@@ -153,7 +155,7 @@
             CheckOperandType(capabilities, V1_2::OperandType::OEM, FLT_MAX, FLT_MAX);
             CheckOperandType(capabilities, V1_2::OperandType::TENSOR_OEM_BYTE, FLT_MAX, FLT_MAX);
 
-            BOOST_ASSERT(error == V1_0::ErrorStatus::NONE);
+            ARMNN_ASSERT(error == V1_0::ErrorStatus::NONE);
         };
 
     armnn::IRuntime::CreationOptions options;

test/TestTensor.cpp

diff --git a/test/TestTensor.cpp b/test/TestTensor.cpp
index a8045c5..e6cb446 100644
--- a/test/TestTensor.cpp
+++ b/test/TestTensor.cpp
@@ -25,7 +25,7 @@
 
 const float * TestTensor::GetData() const
 {
-    BOOST_ASSERT(m_Data.empty() == false);
+    ARMNN_ASSERT(m_Data.empty() == false);
     return &m_Data[0];
 }
 

test/TestTensor.hpp

diff --git a/test/TestTensor.hpp b/test/TestTensor.hpp
index 623c9fb..1cd1950 100644
--- a/test/TestTensor.hpp
+++ b/test/TestTensor.hpp
@@ -6,6 +6,8 @@
 
 #include "../ArmnnDriver.hpp"
 
+#include <armnn/utility/Assert.hpp>
+
 namespace driverTestHelpers
 {
 
@@ -17,7 +19,7 @@
     : m_Shape{shape}
     , m_Data{data}
     {
-        BOOST_ASSERT(m_Shape.GetNumElements() == m_Data.size());
+        ARMNN_ASSERT(m_Shape.GetNumElements() == m_Data.size());
     }
 
     hidl_vec<uint32_t> GetDimensions() const;