From 641cd890dccaecf3a213d6fefba7701e427eb4a2 Mon Sep 17 00:00:00 2001
From: Tamas Petz <tamas.petz@arm.com>
Date: Mon, 18 Dec 2023 16:01:08 +0100
Subject: [PATCH] [NFC][test] Simplify typed tests for add/sub/absdiff

TypeParam is the same as decltype(this->value_).
---
 test/api/test_saturating_absdiff.cpp | 11 +++--------
 test/api/test_saturating_add.cpp     | 11 +++--------
 test/api/test_saturating_sub.cpp     | 11 +++--------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/test/api/test_saturating_absdiff.cpp b/test/api/test_saturating_absdiff.cpp
index 0eab54522..4b52d1066 100644
--- a/test/api/test_saturating_absdiff.cpp
+++ b/test/api/test_saturating_absdiff.cpp
@@ -83,11 +83,7 @@ class SaturatingAbsDiffTest final : public BinaryOperationTest<ElementType> {
 };  // end of class SaturatingAbsDiffTest<ElementType>
 
 template <typename ElementType>
-class SaturatingAbsDiff : public testing::Test {
- public:
-  /// Dummy value, only used to get the type.
-  ElementType value_;
-};  // end of class SaturatingAbsDiff<ElementType>
+class SaturatingAbsDiff : public testing::Test {};
 
 using ElementTypes =
     ::testing::Types<int8_t, uint8_t, int16_t, uint16_t, int32_t>;
@@ -95,11 +91,10 @@ TYPED_TEST_SUITE(SaturatingAbsDiff, ElementTypes);
 
 /// Tests \ref intrinsiccv_saturating_absdiff_<type> API.
 TYPED_TEST(SaturatingAbsDiff, API) {
-  using ElementType = decltype(this->value_);
   // Test without padding.
-  SaturatingAbsDiffTest<ElementType>{}.test();
+  SaturatingAbsDiffTest<TypeParam>{}.test();
   // Test with padding.
-  SaturatingAbsDiffTest<ElementType>{}
+  SaturatingAbsDiffTest<TypeParam>{}
       .with_padding(test::Options::vector_length())
       .test();
 }
diff --git a/test/api/test_saturating_add.cpp b/test/api/test_saturating_add.cpp
index fdf9dfa5a..505fb909a 100644
--- a/test/api/test_saturating_add.cpp
+++ b/test/api/test_saturating_add.cpp
@@ -75,11 +75,7 @@ class SaturatingAddTest final : public BinaryOperationTest<ElementType> {
 };  // end of class SaturatingAddTest<ElementType>
 
 template <typename ElementType>
-class SaturatingAdd : public testing::Test {
- public:
-  /// Dummy value, only used to get the type.
-  ElementType value_;
-};  // end of class SaturatingAdd<ElementType>
+class SaturatingAdd : public testing::Test {};
 
 using ElementTypes = ::testing::Types<int8_t, uint8_t, int16_t, uint16_t,
                                       int32_t, uint32_t, int64_t, uint64_t>;
@@ -87,11 +83,10 @@ TYPED_TEST_SUITE(SaturatingAdd, ElementTypes);
 
 /// Tests \ref intrinsiccv_saturating_add_<type> API.
 TYPED_TEST(SaturatingAdd, API) {
-  using ElementType = decltype(this->value_);
   // Test without padding.
-  SaturatingAddTest<ElementType>{}.test();
+  SaturatingAddTest<TypeParam>{}.test();
   // Test with padding.
-  SaturatingAddTest<ElementType>{}
+  SaturatingAddTest<TypeParam>{}
       .with_padding(test::Options::vector_length())
       .test();
 }
diff --git a/test/api/test_saturating_sub.cpp b/test/api/test_saturating_sub.cpp
index 340747d69..89c1509d7 100644
--- a/test/api/test_saturating_sub.cpp
+++ b/test/api/test_saturating_sub.cpp
@@ -77,11 +77,7 @@ class SaturatingSubTest final : public BinaryOperationTest<ElementType> {
 };  // end of class SaturatingSubTest<ElementType>
 
 template <typename ElementType>
-class SaturatingSub : public testing::Test {
- public:
-  /// Dummy value, only used to get the type.
-  ElementType value_;
-};  // end of class SaturatingSub<ElementType>
+class SaturatingSub : public testing::Test {};
 
 using ElementTypes = ::testing::Types<int8_t, uint8_t, int16_t, uint16_t,
                                       int32_t, uint32_t, int64_t, uint64_t>;
@@ -89,11 +85,10 @@ TYPED_TEST_SUITE(SaturatingSub, ElementTypes);
 
 /// Tests \ref intrinsiccv_saturating_sub_<type> API.
 TYPED_TEST(SaturatingSub, API) {
-  using ElementType = decltype(this->value_);
   // Test without padding.
-  SaturatingSubTest<ElementType>{}.test();
+  SaturatingSubTest<TypeParam>{}.test();
   // Test with padding.
-  SaturatingSubTest<ElementType>{}
+  SaturatingSubTest<TypeParam>{}
       .with_padding(test::Options::vector_length())
       .test();
 }
-- 
GitLab