Add float TIFF test for 2d_simple_filter

kostrykin · Mar 21, 2024 · a06833f · a06833f
1 parent ab42abd
commit a06833f
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 25 deletions.
diff --git a/tools/2d_simple_filter/filter.xml b/tools/2d_simple_filter/filter.xml
@@ -67,53 +67,61 @@
        <data format="tiff" name="output" />
     </outputs> 
     <tests>
-        <!--
-
-            The input file `sample.tif` is an uint8 image with values ranging between 23 and 254,
-            with a mean value of 63.67.
+        <!-- Tests with uint8 TIFF input image -->
+        <test>
+            <param name="input" value="input1_uint8.tif" />
+            <param name="filter_type" value="gaussian" />
+            <expand macro="tests/intensity_image_diff" name="output" value="input1_gaussian.tif" ftype="tiff">
+                <!--
 
-            In the tests below we use assertions in addition to the `image_diff` comparison, to
-            ensure that the range of values is preserved. The motiviation behind this is that the
-            expectation images are usually checked visually, which means that the `image_diff`
-            comparison is likely to ensure that the brightness of the image is preserved, but
-            it's good to double-check the range of values (hence the large value for `eps`).
+                The input file `input1_uint8.tif` has values ranging between 23 and 254, with a mean value of 63.67.
 
-            This only concerns filters like Gaussians and the median filter.
+                Below, we use an assertion in addition to the `image_diff` comparison, to ensure that the range of
+                values is preserved. The motiviation behind this is that the expectation images are usually checked
+                visually, which means that the `image_diff` comparison is likely to ensure that the brightness of
+                the image is preserved, thus it's good to double-check the range of values (hence the large value
+                for `eps`). This also concerns the median filter.
 
-        -->
-        <test>
-            <param name="input" value="sample.tif" />
-            <param name="filter_type" value="gaussian" />
-            <expand macro="tests/intensity_image_diff" name="output" value="gaussian.tif" ftype="tiff">
+                -->
                 <has_image_mean_intensity mean_intensity="63.67" eps="10"/>
             </expand>
         </test>
         <test>
-            <param name="input" value="sample.tif" />
+            <param name="input" value="input1_uint8.tif" />
             <param name="filter_type" value="median" />
-            <expand macro="tests/intensity_image_diff" name="output" value="median.tif" ftype="tiff">
+            <expand macro="tests/intensity_image_diff" name="output" value="input1_median.tif" ftype="tiff">
+                <!-- See note for Gaussian filter above. -->
                 <has_image_mean_intensity mean_intensity="63.67" eps="10"/>
             </expand>
         </test>
         <test>
-            <param name="input" value="sample.tif" />
+            <param name="input" value="input1_uint8.tif" />
             <param name="filter_type" value="prewitt_h" />
-            <expand macro="tests/intensity_image_diff" name="output" value="prewitt_h.tif" ftype="tiff"/>
+            <expand macro="tests/intensity_image_diff" name="output" value="input1_prewitt_h.tif" ftype="tiff"/>
         </test>
         <test>
-            <param name="input" value="sample.tif" />
+            <param name="input" value="input1_uint8.tif" />
             <param name="filter_type" value="prewitt_v" />
-            <expand macro="tests/intensity_image_diff" name="output" value="prewitt_v.tif" ftype="tiff"/>
+            <expand macro="tests/intensity_image_diff" name="output" value="input1_prewitt_v.tif" ftype="tiff"/>
         </test>
         <test>
-            <param name="input" value="sample.tif" />
+            <param name="input" value="input1_uint8.tif" />
             <param name="filter_type" value="sobel_h" />
-            <expand macro="tests/intensity_image_diff" name="output" value="sobel_h.tif" ftype="tiff"/>
+            <expand macro="tests/intensity_image_diff" name="output" value="input1_sobel_h.tif" ftype="tiff"/>
         </test>
         <test>
-            <param name="input" value="sample.tif" />
+            <param name="input" value="input1_uint8.tif" />
             <param name="filter_type" value="sobel_v" />
-            <expand macro="tests/intensity_image_diff" name="output" value="sobel_v.tif" ftype="tiff"/>
+            <expand macro="tests/intensity_image_diff" name="output" value="input1_sobel_v.tif" ftype="tiff"/>
+        </test>
+        <!-- Tests with float TIFF input image -->
+        <test>
+            <param name="input" value="input2_float.tif" />
+            <param name="filter_type" value="gaussian" />
+            <expand macro="tests/intensity_image_diff" name="output" value="input2_gaussian.tif" ftype="tiff">
+                <!-- See note for Gaussian filter above. -->
+                <has_image_mean_intensity mean_intensity="0.25" eps="0.01"/>
+            </expand>
         </test>
     </tests>
     <help>

diff --git a/...s/2d_simple_filter/test-data/gaussian.tif → ...mple_filter/test-data/input1_gaussian.tif b/...s/2d_simple_filter/test-data/gaussian.tif → ...mple_filter/test-data/input1_gaussian.tif
diff --git a/tools/2d_simple_filter/test-data/median.tif → ...simple_filter/test-data/input1_median.tif b/tools/2d_simple_filter/test-data/median.tif → ...simple_filter/test-data/input1_median.tif
diff --git a/.../2d_simple_filter/test-data/prewitt_h.tif → ...ple_filter/test-data/input1_prewitt_h.tif b/.../2d_simple_filter/test-data/prewitt_h.tif → ...ple_filter/test-data/input1_prewitt_h.tif
diff --git a/.../2d_simple_filter/test-data/prewitt_v.tif → ...ple_filter/test-data/input1_prewitt_v.tif b/.../2d_simple_filter/test-data/prewitt_v.tif → ...ple_filter/test-data/input1_prewitt_v.tif
diff --git a/tools/2d_simple_filter/test-data/sobel_h.tif → ...imple_filter/test-data/input1_sobel_h.tif b/tools/2d_simple_filter/test-data/sobel_h.tif → ...imple_filter/test-data/input1_sobel_h.tif
diff --git a/tools/2d_simple_filter/test-data/sobel_v.tif → ...imple_filter/test-data/input1_sobel_v.tif b/tools/2d_simple_filter/test-data/sobel_v.tif → ...imple_filter/test-data/input1_sobel_v.tif
diff --git a/tools/2d_simple_filter/test-data/sample.tif → ..._simple_filter/test-data/input1_uint8.tif b/tools/2d_simple_filter/test-data/sample.tif → ..._simple_filter/test-data/input1_uint8.tif
diff --git a/tools/2d_simple_filter/test-data/input2_float.tif b/tools/2d_simple_filter/test-data/input2_float.tif
diff --git a/tools/2d_simple_filter/test-data/input2_gaussian.tif b/tools/2d_simple_filter/test-data/input2_gaussian.tif
diff --git a/tools/2d_simple_filter/test-data/res.tif b/tools/2d_simple_filter/test-data/res.tif