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

1 files changed, 3 insertions, 7 deletions

diff --git a/RequestThread_1_3.cpp b/RequestThread_1_3.cpp
index 59fa70ed..6133e290 100644
--- a/RequestThread_1_3.cpp
+++ b/RequestThread_1_3.cpp
@@ -1,15 +1,12 @@
 //
-// Copyright © 2020 Arm Ltd. All rights reserved.
+// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
 #define LOG_TAG "ArmnnDriver"
 
-#include "RequestThread_1_3.hpp"
-
 #include "ArmnnPreparedModel_1_3.hpp"
-
-#include <armnn/utility/Assert.hpp>
+#include "RequestThread_1_3.hpp"
 
 #include <log/log.h>
 
@@ -178,8 +175,7 @@ void RequestThread_1_3<PreparedModel, HalVersion, CallbackContext>::Process()
 
             default:
                 // this should be unreachable
-                ALOGE("RequestThread_1_3::Process() - invalid message type");
-                ARMNN_ASSERT_MSG(false, "ArmNN: RequestThread_1_3: invalid message type");
+                throw armnn::RuntimeException("ArmNN: RequestThread_1_3: invalid message type");
         }
     }
 }