diff options
author | Mike Kelly <mike.kelly@arm.com> | 2021-10-14 12:35:58 +0100 |
---|---|---|
committer | Mike Kelly <mike.kelly@arm.com> | 2021-10-14 12:35:58 +0100 |
commit | e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b (patch) | |
tree | 79d9178420924d57ed0ab23db46ff57159279886 /test/1.2/Dilation.cpp | |
parent | 4bd8f7c96e01e081276c376fe5c34018e7b70d17 (diff) | |
download | android-nn-driver-e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b.tar.gz |
IVGCVSW-6428 Remove asserts
* Changed asserts to check for errors and return appropriate values or
throw exceptions
* Changed unit tests to use Doctest's long macro names as the short
macro names clashed with Android's Logging macros
* Removed unused #includes
* Clarified ambiguous #includes
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Ice92a37590df727fd581d3be5ff2716665f26a13
Diffstat (limited to 'test/1.2/Dilation.cpp')
-rw-r--r-- | test/1.2/Dilation.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/test/1.2/Dilation.cpp b/test/1.2/Dilation.cpp index e1cde9fd..c9182a7c 100644 --- a/test/1.2/Dilation.cpp +++ b/test/1.2/Dilation.cpp @@ -1,17 +1,16 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "../Dilation.hpp" -#include "../../1.2/HalPolicy.hpp" +#include <1.2/HalPolicy.hpp> -#include <doctest/doctest.h> - -TEST_SUITE("DilationTests") +DOCTEST_TEST_SUITE("DilationTests") { -TEST_CASE("ConvolutionExplicitPaddingNoDilation") + +DOCTEST_TEST_CASE("ConvolutionExplicitPaddingNoDilation") { DilationTestOptions options; options.m_IsDepthwiseConvolution = false; @@ -21,7 +20,7 @@ TEST_CASE("ConvolutionExplicitPaddingNoDilation") DilationTestImpl<hal_1_2::HalPolicy>(options); } -TEST_CASE("ConvolutionExplicitPaddingDilation") +DOCTEST_TEST_CASE("ConvolutionExplicitPaddingDilation") { DilationTestOptions options; options.m_IsDepthwiseConvolution = false; @@ -31,7 +30,7 @@ TEST_CASE("ConvolutionExplicitPaddingDilation") DilationTestImpl<hal_1_2::HalPolicy>(options); } -TEST_CASE("ConvolutionImplicitPaddingNoDilation") +DOCTEST_TEST_CASE("ConvolutionImplicitPaddingNoDilation") { DilationTestOptions options; options.m_IsDepthwiseConvolution = false; @@ -41,7 +40,7 @@ TEST_CASE("ConvolutionImplicitPaddingNoDilation") DilationTestImpl<hal_1_2::HalPolicy>(options); } -TEST_CASE("ConvolutionImplicitPaddingDilation") +DOCTEST_TEST_CASE("ConvolutionImplicitPaddingDilation") { DilationTestOptions options; options.m_IsDepthwiseConvolution = false; @@ -51,7 +50,7 @@ TEST_CASE("ConvolutionImplicitPaddingDilation") DilationTestImpl<hal_1_2::HalPolicy>(options); } -TEST_CASE("DepthwiseConvolutionExplicitPaddingNoDilation") +DOCTEST_TEST_CASE("DepthwiseConvolutionExplicitPaddingNoDilation") { DilationTestOptions options; options.m_IsDepthwiseConvolution = true; @@ -61,7 +60,7 @@ TEST_CASE("DepthwiseConvolutionExplicitPaddingNoDilation") DilationTestImpl<hal_1_2::HalPolicy>(options); } -TEST_CASE("DepthwiseConvolutionExplicitPaddingDilation") +DOCTEST_TEST_CASE("DepthwiseConvolutionExplicitPaddingDilation") { DilationTestOptions options; options.m_IsDepthwiseConvolution = true; @@ -71,7 +70,7 @@ TEST_CASE("DepthwiseConvolutionExplicitPaddingDilation") DilationTestImpl<hal_1_2::HalPolicy>(options); } -TEST_CASE("DepthwiseConvolutionImplicitPaddingNoDilation") +DOCTEST_TEST_CASE("DepthwiseConvolutionImplicitPaddingNoDilation") { DilationTestOptions options; options.m_IsDepthwiseConvolution = true; @@ -81,7 +80,7 @@ TEST_CASE("DepthwiseConvolutionImplicitPaddingNoDilation") DilationTestImpl<hal_1_2::HalPolicy>(options); } -TEST_CASE("DepthwiseConvolutionImplicitPaddingDilation") +DOCTEST_TEST_CASE("DepthwiseConvolutionImplicitPaddingDilation") { DilationTestOptions options; options.m_IsDepthwiseConvolution = true; |