IVGCVSW-4485 Remove Boost assert
* Change boost assert to armnn assert
* Change include file to armnn assert
* Fix ARMNN_ASSERT_MSG issue with multiple conditions
* Change BOOST_ASSERT to BOOST_TEST where appropriate
* Remove unused include statements
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I5d0fa3a37b7c1c921216de68f0073aa34702c9ff
diff --git a/tests/InferenceTest.cpp b/tests/InferenceTest.cpp
index c6e5011..7e165b5 100644
--- a/tests/InferenceTest.cpp
+++ b/tests/InferenceTest.cpp
@@ -4,11 +4,12 @@
//
#include "InferenceTest.hpp"
+#include <armnn/utility/Assert.hpp>
+
#include "../src/armnn/Profiling.hpp"
#include <boost/algorithm/string.hpp>
#include <boost/numeric/conversion/cast.hpp>
#include <boost/filesystem/path.hpp>
-#include <boost/assert.hpp>
#include <boost/format.hpp>
#include <boost/program_options.hpp>
#include <boost/filesystem/operations.hpp>
@@ -55,7 +56,7 @@
// Coverity points out that default_value(...) can throw a bad_lexical_cast,
// and that desc.add_options() can throw boost::io::too_few_args.
// They really won't in any of these cases.
- BOOST_ASSERT_MSG(false, "Caught unexpected exception");
+ ARMNN_ASSERT_MSG(false, "Caught unexpected exception");
std::cerr << "Fatal internal error: " << e.what() << std::endl;
return false;
}
@@ -228,7 +229,7 @@
success = false;
break;
default:
- BOOST_ASSERT_MSG(false, "Unexpected TestCaseResult");
+ ARMNN_ASSERT_MSG(false, "Unexpected TestCaseResult");
return false;
}
}