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.0/Convolution2D.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.0/Convolution2D.cpp')
| -rw-r--r-- | test/1.0/Convolution2D.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/test/1.0/Convolution2D.cpp b/test/1.0/Convolution2D.cpp index c833d89b..2af09157 100644 --- a/test/1.0/Convolution2D.cpp +++ b/test/1.0/Convolution2D.cpp @@ -1,18 +1,14 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#include "../DriverTestHelpers.hpp" #include "../Convolution2D.hpp" -#include "../../1.0/HalPolicy.hpp" -#include <doctest/doctest.h> #include <log/log.h> #include <OperationsUtils.h> - using namespace android::hardware; using namespace driverTestHelpers; using namespace armnn_driver; @@ -28,16 +24,15 @@ void SetModelFp16Flag(V1_0::Model&, bool) } // namespace driverTestHelpers -TEST_SUITE("Convolution2DTests_1.0") +DOCTEST_TEST_SUITE("Convolution2DTests_1.0") { - -TEST_CASE("ConvValidPadding_Hal_1_0") +DOCTEST_TEST_CASE("ConvValidPadding_Hal_1_0") { PaddingTestImpl<hal_1_0::HalPolicy>(android::nn::kPaddingValid); } -TEST_CASE("ConvSamePadding_Hal_1_0") +DOCTEST_TEST_CASE("ConvSamePadding_Hal_1_0") { PaddingTestImpl<hal_1_0::HalPolicy>(android::nn::kPaddingSame); } |