1 files changed, 15 insertions, 49 deletions

diff --git a/delegate/test/ExpandDimsTest.cpp b/delegate/test/ExpandDimsTest.cpp
index 8c21f731cc..25d911db8a 100644
--- a/delegate/test/ExpandDimsTest.cpp
+++ b/delegate/test/ExpandDimsTest.cpp
@@ -1,14 +1,16 @@
 //
-// Copyright © 2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2023-2024 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
 #include "RedefineTestHelper.hpp"
 
+#include <doctest/doctest.h>
+
 namespace armnnDelegate
 {
 
-void ExpandDimsSimpleTest(std::vector<armnn::BackendId>& backends)
+void ExpandDimsSimpleTest()
 {
     // Set input data
     std::vector<int32_t> inputShape  { 2, 2, 1 };
@@ -20,15 +22,15 @@ void ExpandDimsSimpleTest(std::vector<armnn::BackendId>& backends)
 
     RedefineTest<float>(tflite::BuiltinOperator_EXPAND_DIMS,
                         ::tflite::TensorType_FLOAT32,
-                        backends,
                         inputShape,
                         outputShape,
                         inputValues,
                         expectedOutputValues,
-                        axis);
+                        axis,
+                        true);
 }
 
-void ExpandDimsWithNegativeAxisTest(std::vector<armnn::BackendId>& backends)
+void ExpandDimsWithNegativeAxisTest()
 {
     // Set input data
     std::vector<int32_t> inputShape  { 1, 2, 2 };
@@ -40,63 +42,27 @@ void ExpandDimsWithNegativeAxisTest(std::vector<armnn::BackendId>& backends)
 
     RedefineTest<float>(tflite::BuiltinOperator_EXPAND_DIMS,
                         ::tflite::TensorType_FLOAT32,
-                        backends,
                         inputShape,
                         outputShape,
                         inputValues,
                         expectedOutputValues,
-                        axis);
-}
-
-TEST_SUITE("ExpandDims_GpuAccTests")
-{
-
-TEST_CASE ("ExpandDims_Simple_GpuAcc_Test")
-{
-    std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc };
-    ExpandDimsSimpleTest(backends);
+                        axis,
+                        true);
 }
 
-TEST_CASE ("ExpandDims_With_Negative_Axis_GpuAcc_Test")
-{
-    std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc };
-    ExpandDimsWithNegativeAxisTest(backends);
-}
-
-} // TEST_SUITE("ExpandDims_GpuAccTests")
-
-TEST_SUITE("ExpandDims_CpuAccTests")
-{
-
-TEST_CASE ("ExpandDims_Simple_CpuAcc_Test")
-{
-    std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc };
-    ExpandDimsSimpleTest(backends);
-}
-
-TEST_CASE ("ExpandDims_With_Negative_Axis_CpuAcc_Test")
-{
-    std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc };
-    ExpandDimsWithNegativeAxisTest(backends);
-}
-
-} // TEST_SUITE("ExpandDims_CpuAccTests")
-
-TEST_SUITE("ExpandDims_CpuRefTests")
+TEST_SUITE("ExpandDimsTests")
 {
 
-TEST_CASE ("ExpandDims_Simple_CpuRef_Test")
+TEST_CASE ("ExpandDims_Simple_Test")
 {
-    std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef };
-    ExpandDimsSimpleTest(backends);
+    ExpandDimsSimpleTest();
 }
 
-TEST_CASE ("ExpandDims_With_Negative_Axis_CpuRef_Test")
+TEST_CASE ("ExpandDims_With_Negative_Axis_Test")
 {
-    std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef };
-    ExpandDimsWithNegativeAxisTest(backends);
+    ExpandDimsWithNegativeAxisTest();
 }
 
-} // TEST_SUITE("ExpandDims_CpuRefTests")
+} // TEST_SUITE("ExpandDimsTests")
 
 } // namespace armnnDelegate
\ No newline at end of file