diff options
Diffstat (limited to 'src/armnn/test')
-rw-r--r-- | src/armnn/test/CsvReaderTest.cpp | 1 | ||||
-rw-r--r-- | src/armnn/test/InferOutputTests.hpp | 1 | ||||
-rw-r--r-- | src/armnn/test/ModelAccuracyCheckerTest.cpp | 1 | ||||
-rw-r--r-- | src/armnn/test/ProfilerTests.cpp | 19 | ||||
-rw-r--r-- | src/armnn/test/UnitTests.cpp | 14 |
5 files changed, 15 insertions, 21 deletions
diff --git a/src/armnn/test/CsvReaderTest.cpp b/src/armnn/test/CsvReaderTest.cpp index ed27e57f8e..8491ad778d 100644 --- a/src/armnn/test/CsvReaderTest.cpp +++ b/src/armnn/test/CsvReaderTest.cpp @@ -4,7 +4,6 @@ // #include "CsvReader.hpp" -#include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> #include <iostream> diff --git a/src/armnn/test/InferOutputTests.hpp b/src/armnn/test/InferOutputTests.hpp index 70afbc9b3f..0413682dad 100644 --- a/src/armnn/test/InferOutputTests.hpp +++ b/src/armnn/test/InferOutputTests.hpp @@ -14,7 +14,6 @@ #include <layers/PreluLayer.hpp> #include <layers/StackLayer.hpp> -#include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> void ArgMinMaxInferOutputShapeImpl(const armnn::ArgMinMaxDescriptor descriptor, diff --git a/src/armnn/test/ModelAccuracyCheckerTest.cpp b/src/armnn/test/ModelAccuracyCheckerTest.cpp index 8bbe3d9f41..1bffa9c57c 100644 --- a/src/armnn/test/ModelAccuracyCheckerTest.cpp +++ b/src/armnn/test/ModelAccuracyCheckerTest.cpp @@ -4,7 +4,6 @@ // #include "ModelAccuracyChecker.hpp" -#include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> #include <boost/filesystem.hpp> diff --git a/src/armnn/test/ProfilerTests.cpp b/src/armnn/test/ProfilerTests.cpp index 40e9f470ad..7bd258e430 100644 --- a/src/armnn/test/ProfilerTests.cpp +++ b/src/armnn/test/ProfilerTests.cpp @@ -9,7 +9,6 @@ #include <boost/test/unit_test.hpp> #include <boost/test/tools/output_test_stream.hpp> -#include <boost/algorithm/string.hpp> #include <memory> #include <thread> @@ -231,21 +230,21 @@ BOOST_AUTO_TEST_CASE(WriteEventResults) BOOST_TEST(!output.is_empty(false)); // output should contain event name 'test' - BOOST_CHECK(boost::contains(output.str(), "test")); + BOOST_CHECK(output.str().find("test") != std::string::npos); // output should contain headers - BOOST_CHECK(boost::contains(output.str(), "Event Sequence - Name")); - BOOST_CHECK(boost::contains(output.str(), "Event Stats - Name")); - BOOST_CHECK(boost::contains(output.str(), "Total")); - BOOST_CHECK(boost::contains(output.str(), "Device")); + BOOST_CHECK(output.str().find("Event Sequence - Name") != std::string::npos); + BOOST_CHECK(output.str().find("Event Stats - Name") != std::string::npos); + BOOST_CHECK(output.str().find("Total") != std::string::npos); + BOOST_CHECK(output.str().find("Device") != std::string::npos); // output should contain compute device 'CpuAcc' - BOOST_CHECK(boost::contains(output.str(), "CpuAcc")); + BOOST_CHECK(output.str().find("CpuAcc") != std::string::npos); // output should not contain un-readable numbers - BOOST_CHECK(!(boost::contains(output.str(), "e+"))); + BOOST_CHECK(output.str().find("e+") == std::string::npos); // output should not contain un-readable numbers - BOOST_CHECK(!(boost::contains(output.str(), "+"))); + BOOST_CHECK(output.str().find("+") == std::string::npos); // output should not contain zero value - BOOST_CHECK(!(boost::contains(output.str(), " 0 "))); + BOOST_CHECK(output.str().find(" 0 ") == std::string::npos); } // Disable profiling here to not print out anything on stdout. diff --git a/src/armnn/test/UnitTests.cpp b/src/armnn/test/UnitTests.cpp index 7d171a8d88..071bff0ed8 100644 --- a/src/armnn/test/UnitTests.cpp +++ b/src/armnn/test/UnitTests.cpp @@ -8,8 +8,6 @@ #include "UnitTests.hpp" #include <armnn/Logging.hpp> -#include <boost/algorithm/string.hpp> - struct ConfigureLoggingFixture { ConfigureLoggingFixture() @@ -103,12 +101,12 @@ BOOST_AUTO_TEST_CASE(LoggerTest) } - BOOST_CHECK(boost::contains(ss.str(), "Trace: My trace message; -2")); - BOOST_CHECK(boost::contains(ss.str(), "Debug: My debug message; -1")); - BOOST_CHECK(boost::contains(ss.str(), "Info: My info message; 0")); - BOOST_CHECK(boost::contains(ss.str(), "Warning: My warning message; 1")); - BOOST_CHECK(boost::contains(ss.str(), "Error: My error message; 2")); - BOOST_CHECK(boost::contains(ss.str(), "Fatal: My fatal message; 3")); + BOOST_CHECK(ss.str().find("Trace: My trace message; -2") != std::string::npos); + BOOST_CHECK(ss.str().find("Debug: My debug message; -1") != std::string::npos); + BOOST_CHECK(ss.str().find("Info: My info message; 0") != std::string::npos); + BOOST_CHECK(ss.str().find("Warning: My warning message; 1") != std::string::npos); + BOOST_CHECK(ss.str().find("Error: My error message; 2") != std::string::npos); + BOOST_CHECK(ss.str().find("Fatal: My fatal message; 3") != std::string::npos); } BOOST_AUTO_TEST_SUITE_END() |