COMPMID-669 - Add validation for different border modes

- Box3x3
- Dilate
- Erode
- Gaussian 3x3
- Gaussian 5x5
- Median 3x3

Change-Id: I09a1a4c6fcdf62805626d73386ec56651bd40fb4
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/94862
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>

6 files changed, 18 insertions, 13 deletions

diff --git a/tests/validation/fixtures/Box3x3Fixture.h b/tests/validation/fixtures/Box3x3Fixture.h
index a53987a15d..1aa958a11b 100644
--- a/tests/validation/fixtures/Box3x3Fixture.h
+++ b/tests/validation/fixtures/Box3x3Fixture.h
@@ -52,8 +52,9 @@ public:
         std::uniform_int_distribution<uint8_t> distribution(0, 255);
         const uint8_t                          constant_border_value = distribution(gen);
 
-        _target    = compute_target(shape, data_type, border_mode, constant_border_value);
-        _reference = compute_reference(shape, data_type, border_mode, constant_border_value);
+        _border_mode = border_mode;
+        _target      = compute_target(shape, data_type, border_mode, constant_border_value);
+        _reference   = compute_reference(shape, data_type, border_mode, constant_border_value);
     }
 
 protected:
diff --git a/tests/validation/fixtures/DilateFixture.h b/tests/validation/fixtures/DilateFixture.h
index 0b6fe2ea08..7b56cf6c90 100644
--- a/tests/validation/fixtures/DilateFixture.h
+++ b/tests/validation/fixtures/DilateFixture.h
@@ -52,8 +52,9 @@ public:
         std::uniform_int_distribution<uint8_t> distribution(0, 255);
         const uint8_t                          constant_border_value = distribution(gen);
 
-        _target    = compute_target(shape, data_type, border_mode, constant_border_value);
-        _reference = compute_reference(shape, data_type, border_mode, constant_border_value);
+        _border_mode = border_mode;
+        _target      = compute_target(shape, data_type, border_mode, constant_border_value);
+        _reference   = compute_reference(shape, data_type, border_mode, constant_border_value);
     }
 
 protected:
diff --git a/tests/validation/fixtures/ErodeFixture.h b/tests/validation/fixtures/ErodeFixture.h
index 86b394fbf3..6ba5fc1e78 100644
--- a/tests/validation/fixtures/ErodeFixture.h
+++ b/tests/validation/fixtures/ErodeFixture.h
@@ -52,8 +52,9 @@ public:
         std::uniform_int_distribution<uint8_t> distribution(0, 255);
         const uint8_t                          constant_border_value = distribution(gen);
 
-        _target    = compute_target(shape, data_type, border_mode, constant_border_value);
-        _reference = compute_reference(shape, data_type, border_mode, constant_border_value);
+        _border_mode = border_mode;
+        _target      = compute_target(shape, data_type, border_mode, constant_border_value);
+        _reference   = compute_reference(shape, data_type, border_mode, constant_border_value);
     }
 
 protected:
diff --git a/tests/validation/fixtures/Gaussian3x3Fixture.h b/tests/validation/fixtures/Gaussian3x3Fixture.h
index 3b15921d45..72f082e64c 100644
--- a/tests/validation/fixtures/Gaussian3x3Fixture.h
+++ b/tests/validation/fixtures/Gaussian3x3Fixture.h
@@ -52,8 +52,9 @@ public:
         std::uniform_int_distribution<uint8_t> distribution(0, 255);
         const uint8_t                          constant_border_value = distribution(gen);
 
-        _target    = compute_target(shape, data_type, border_mode, constant_border_value);
-        _reference = compute_reference(shape, data_type, border_mode, constant_border_value);
+        _border_mode = border_mode;
+        _target      = compute_target(shape, data_type, border_mode, constant_border_value);
+        _reference   = compute_reference(shape, data_type, border_mode, constant_border_value);
     }
 
 protected:
diff --git a/tests/validation/fixtures/Gaussian5x5Fixture.h b/tests/validation/fixtures/Gaussian5x5Fixture.h
index b1f7f28cd3..9fdb0d2422 100644
--- a/tests/validation/fixtures/Gaussian5x5Fixture.h
+++ b/tests/validation/fixtures/Gaussian5x5Fixture.h
@@ -52,8 +52,9 @@ public:
         std::uniform_int_distribution<uint8_t> distribution(0, 255);
         const uint8_t                          constant_border_value = distribution(gen);
 
-        _target    = compute_target(shape, data_type, border_mode, constant_border_value);
-        _reference = compute_reference(shape, data_type, border_mode, constant_border_value);
+        _border_mode = border_mode;
+        _target      = compute_target(shape, data_type, border_mode, constant_border_value);
+        _reference   = compute_reference(shape, data_type, border_mode, constant_border_value);
     }
 
 protected:
diff --git a/tests/validation/fixtures/Median3x3Fixture.h b/tests/validation/fixtures/Median3x3Fixture.h
index 67f4b1b53f..b45e93585a 100644
--- a/tests/validation/fixtures/Median3x3Fixture.h
+++ b/tests/validation/fixtures/Median3x3Fixture.h
@@ -51,10 +51,10 @@ public:
         std::mt19937                           gen(library->seed());
         std::uniform_int_distribution<uint8_t> distribution(0, 255);
         const uint8_t                          constant_border_value = distribution(gen);
-        _border_mode                                                 = border_mode;
 
-        _target    = compute_target(shape, data_type, border_mode, constant_border_value);
-        _reference = compute_reference(shape, data_type, border_mode, constant_border_value);
+        _border_mode = border_mode;
+        _target      = compute_target(shape, data_type, border_mode, constant_border_value);
+        _reference   = compute_reference(shape, data_type, border_mode, constant_border_value);
     }
 
 protected: