From ac2770a4bb6461bfbddec928bb6208f26f898f02 Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Wed, 1 Apr 2020 16:51:23 +0100 Subject: 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 Change-Id: I5d0fa3a37b7c1c921216de68f0073aa34702c9ff --- src/armnnUtils/test/ParserHelperTest.cpp | 28 +++++++++++------------ src/armnnUtils/test/PrototxtConversionsTest.cpp | 30 ++++++++++++------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src/armnnUtils/test') diff --git a/src/armnnUtils/test/ParserHelperTest.cpp b/src/armnnUtils/test/ParserHelperTest.cpp index dc37450ac1..dbf0673bf5 100644 --- a/src/armnnUtils/test/ParserHelperTest.cpp +++ b/src/armnnUtils/test/ParserHelperTest.cpp @@ -29,8 +29,8 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData1, keepDims, outputTensorInfo1); - BOOST_ASSERT(outputTensorInfo1.GetNumDimensions() == 1); - BOOST_ASSERT(outputTensorInfo1.GetShape()[0] == 1); + BOOST_TEST(outputTensorInfo1.GetNumDimensions() == 1); + BOOST_TEST(outputTensorInfo1.GetShape()[0] == 1); // Reducing dimension 0 results in a 3x4 size tensor (one dimension) std::set axisData2 = { 0 }; @@ -38,8 +38,8 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData2, keepDims, outputTensorInfo2); - BOOST_ASSERT(outputTensorInfo2.GetNumDimensions() == 1); - BOOST_ASSERT(outputTensorInfo2.GetShape()[0] == 12); + BOOST_TEST(outputTensorInfo2.GetNumDimensions() == 1); + BOOST_TEST(outputTensorInfo2.GetShape()[0] == 12); // Reducing dimensions 0,1 results in a 4 size tensor (one dimension) std::set axisData3 = { 0, 1 }; @@ -47,8 +47,8 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData3, keepDims, outputTensorInfo3); - BOOST_ASSERT(outputTensorInfo3.GetNumDimensions() == 1); - BOOST_ASSERT(outputTensorInfo3.GetShape()[0] == 4); + BOOST_TEST(outputTensorInfo3.GetNumDimensions() == 1); + BOOST_TEST(outputTensorInfo3.GetShape()[0] == 4); // Reducing dimension 0 results in a { 1, 3, 4 } dimension tensor keepDims = true; @@ -58,10 +58,10 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData4, keepDims, outputTensorInfo4); - BOOST_ASSERT(outputTensorInfo4.GetNumDimensions() == 3); - BOOST_ASSERT(outputTensorInfo4.GetShape()[0] == 1); - BOOST_ASSERT(outputTensorInfo4.GetShape()[1] == 3); - BOOST_ASSERT(outputTensorInfo4.GetShape()[2] == 4); + BOOST_TEST(outputTensorInfo4.GetNumDimensions() == 3); + BOOST_TEST(outputTensorInfo4.GetShape()[0] == 1); + BOOST_TEST(outputTensorInfo4.GetShape()[1] == 3); + BOOST_TEST(outputTensorInfo4.GetShape()[2] == 4); // Reducing dimension 1, 2 results in a { 2, 1, 1 } dimension tensor keepDims = true; @@ -71,10 +71,10 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData5, keepDims, outputTensorInfo5); - BOOST_ASSERT(outputTensorInfo5.GetNumDimensions() == 3); - BOOST_ASSERT(outputTensorInfo5.GetShape()[0] == 2); - BOOST_ASSERT(outputTensorInfo5.GetShape()[1] == 1); - BOOST_ASSERT(outputTensorInfo5.GetShape()[2] == 1); + BOOST_TEST(outputTensorInfo5.GetNumDimensions() == 3); + BOOST_TEST(outputTensorInfo5.GetShape()[0] == 2); + BOOST_TEST(outputTensorInfo5.GetShape()[1] == 1); + BOOST_TEST(outputTensorInfo5.GetShape()[2] == 1); } diff --git a/src/armnnUtils/test/PrototxtConversionsTest.cpp b/src/armnnUtils/test/PrototxtConversionsTest.cpp index f263a52340..d51c8015cf 100644 --- a/src/armnnUtils/test/PrototxtConversionsTest.cpp +++ b/src/armnnUtils/test/PrototxtConversionsTest.cpp @@ -15,28 +15,28 @@ BOOST_AUTO_TEST_CASE(ConvertInt32ToOctalStringTest) using armnnUtils::ConvertInt32ToOctalString; std::string octalString = ConvertInt32ToOctalString(1); - BOOST_ASSERT(octalString.compare("\\\\001\\\\000\\\\000\\\\000")); + BOOST_TEST(octalString.compare("\\\\001\\\\000\\\\000\\\\000")); octalString = ConvertInt32ToOctalString(256); - BOOST_ASSERT(octalString.compare("\\\\000\\\\100\\\\000\\\\000")); + BOOST_TEST(octalString.compare("\\\\000\\\\100\\\\000\\\\000")); octalString = ConvertInt32ToOctalString(65536); - BOOST_ASSERT(octalString.compare("\\\\000\\\\000\\\\100\\\\000")); + BOOST_TEST(octalString.compare("\\\\000\\\\000\\\\100\\\\000")); octalString = ConvertInt32ToOctalString(16777216); - BOOST_ASSERT(octalString.compare("\\\\000\\\\000\\\\000\\\\100")); + BOOST_TEST(octalString.compare("\\\\000\\\\000\\\\000\\\\100")); octalString = ConvertInt32ToOctalString(-1); - BOOST_ASSERT(octalString.compare("\\\\377\\\\377\\\\377\\\\377")); + BOOST_TEST(octalString.compare("\\\\377\\\\377\\\\377\\\\377")); octalString = ConvertInt32ToOctalString(-256); - BOOST_ASSERT(octalString.compare("\\\\000\\\\377\\\\377\\\\377")); + BOOST_TEST(octalString.compare("\\\\000\\\\377\\\\377\\\\377")); octalString = ConvertInt32ToOctalString(-65536); - BOOST_ASSERT(octalString.compare("\\\\000\\\\000\\\\377\\\\377")); + BOOST_TEST(octalString.compare("\\\\000\\\\000\\\\377\\\\377")); octalString = ConvertInt32ToOctalString(-16777216); - BOOST_ASSERT(octalString.compare("\\\\000\\\\000\\\\000\\\\377")); + BOOST_TEST(octalString.compare("\\\\000\\\\000\\\\000\\\\377")); } BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) @@ -51,13 +51,13 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) }; auto output_string = createAndConvert({5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 5\n" "}")); output_string = createAndConvert({4, 5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 4\n" "}\n" @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({3, 4, 5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 3\n" "}\n" @@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({2, 3, 4, 5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 2\n" "}\n" @@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({1, 2, 3, 4, 5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 1\n" "}\n" @@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({0xffffffff, 0xffffffff}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 4294967295\n" "}\n" @@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({1, 0}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 1\n" "}\n" -- cgit v1.2.1