From 7a00eaa6ecf121623823b1951c0e6c9093271adf Mon Sep 17 00:00:00 2001 From: Matthew Sloyan Date: Sun, 20 Jun 2021 18:45:05 +0100 Subject: Remove remaining boost tests * Updated unit tests to use doctest. Signed-off-by: Matthew Sloyan Change-Id: I5231225cd0830f16cc0ef20e9ef27e7b92feab19 --- src/armnnDeserializer/test/DeserializeDepthwiseConv2d.cpp | 10 +++++----- src/armnnDeserializer/test/DeserializeShape.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/armnnDeserializer/test') diff --git a/src/armnnDeserializer/test/DeserializeDepthwiseConv2d.cpp b/src/armnnDeserializer/test/DeserializeDepthwiseConv2d.cpp index 83dede15c6..1920c1cc79 100644 --- a/src/armnnDeserializer/test/DeserializeDepthwiseConv2d.cpp +++ b/src/armnnDeserializer/test/DeserializeDepthwiseConv2d.cpp @@ -7,12 +7,12 @@ #include -#include +#include #include -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_DepthwiseConv2d") +{ struct DepthwiseConv2dFlatbufferVersion1Fixture : public ParserFlatbuffersSerializeFixture { explicit DepthwiseConv2dFlatbufferVersion1Fixture() @@ -218,7 +218,7 @@ struct DepthwiseConv2dFlatbufferVersion1Fixture : public ParserFlatbuffersSerial // file. It ensures older models can still be read and executed // featureVersion weights layout scheme 1 indicates a change in the depthwise weights layout within // armm from [M,I,H,W] --> [1,H,W,I*M] -BOOST_FIXTURE_TEST_CASE(DepthwiseConv2d_FlatbufferVersion1, DepthwiseConv2dFlatbufferVersion1Fixture) +TEST_CASE_FIXTURE(DepthwiseConv2dFlatbufferVersion1Fixture, "DepthwiseConv2d_FlatbufferVersion1") { RunTest<4, armnn::DataType::QAsymmS8>( 0, @@ -230,4 +230,4 @@ BOOST_FIXTURE_TEST_CASE(DepthwiseConv2d_FlatbufferVersion1, DepthwiseConv2dFlatb 25,36,12,37,42,25,29,14, 9}); } -BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file +} \ No newline at end of file diff --git a/src/armnnDeserializer/test/DeserializeShape.cpp b/src/armnnDeserializer/test/DeserializeShape.cpp index a20fb59699..5d5e04e7a4 100644 --- a/src/armnnDeserializer/test/DeserializeShape.cpp +++ b/src/armnnDeserializer/test/DeserializeShape.cpp @@ -3,14 +3,15 @@ // SPDX-License-Identifier: MIT // -#include #include "ParserFlatbuffersSerializeFixture.hpp" #include -#include +#include -BOOST_AUTO_TEST_SUITE(Deserializer) +#include +TEST_SUITE("Deserializer_Shape") +{ struct ShapeFixture : public ParserFlatbuffersSerializeFixture { explicit ShapeFixture() @@ -114,13 +115,12 @@ struct ShapeFixture : public ParserFlatbuffersSerializeFixture } }; - struct SimpleShapeFixture : ShapeFixture { SimpleShapeFixture() : ShapeFixture() {} }; -BOOST_FIXTURE_TEST_CASE(DeserializeShape, SimpleShapeFixture) +TEST_CASE_FIXTURE(SimpleShapeFixture, "DeserializeShape") { RunTest<1, armnn::DataType::Signed32>( 0, @@ -128,4 +128,4 @@ BOOST_FIXTURE_TEST_CASE(DeserializeShape, SimpleShapeFixture) {{"OutputLayer",{ 1, 3, 3, 1 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} -- cgit v1.2.1