[gdk-pixbuf/wip/otte/tga] tests: Name test images properly



commit ab39a47af44de683b8460ddd00f73fd9d1f55074
Author: Benjamin Otte <otte redhat com>
Date:   Tue Oct 6 01:13:04 2015 +0200

    tests: Name test images properly
    
    Make sure they have a sane file extension so it's easy for tools to
    identify them from their filename.

 tests/pixbuf-scale.c                               |   14 +++++++-------
 tests/pixbuf-threads.c                             |   16 ++++++++--------
 .../{invalid_bmp_1 => invalid.1.bmp}               |  Bin 6966 -> 6966 bytes
 .../{invalid_gif_test_1 => invalid.1.gif}          |    0
 .../{invalid_ico_test_1 => invalid.1.ico}          |  Bin 318 -> 318 bytes
 .../{invalid_png_test_1 => invalid.1.png}          |    0
 .../{invalid_ppm_1 => invalid.1.ppm}               |    0
 .../{invalid_tga_test_1 => invalid.1.tga}          |  Bin 23679 -> 23679 bytes
 .../{invalid_xpm_test_1 => invalid.1.xpm}          |    0
 .../{invalid_gif_test_2 => invalid.2.gif}          |  Bin 562 -> 562 bytes
 .../{invalid_ico_test_2 => invalid.2.ico}          |  Bin 318 -> 318 bytes
 .../{invalid_png_test_2 => invalid.2.png}          |  Bin 2755 -> 2755 bytes
 .../{invalid_ppm_2 => invalid.2.ppm}               |    0
 .../{invalid_gif_test_3 => invalid.3.gif}          |  Bin 318 -> 318 bytes
 .../{invalid_ico_test_3 => invalid.3.ico}          |    0
 .../{invalid_png_test_3 => invalid.3.png}          |  Bin 64 -> 64 bytes
 .../{invalid_ppm_3 => invalid.3.ppm}               |    0
 .../{invalid_gif_test_4 => invalid.4.gif}          |  Bin 310 -> 310 bytes
 .../{invalid_png_test_4 => invalid.4.png}          |    0
 .../{invalid_ppm_4 => invalid.4.ppm}               |    0
 .../{invalid_ppm_5 => invalid.5.ppm}               |    0
 .../{invalid_ppm_6 => invalid.6.ppm}               |    0
 .../{invalid_ppm_7 => invalid.7.ppm}               |    0
 .../{invalid_ppm_8 => invalid.8.ppm}               |    0
 .../{valid_bmp_test => valid.1.bmp}                |  Bin 6966 -> 6966 bytes
 .../{valid_gif_test => valid.1.gif}                |  Bin 310 -> 310 bytes
 .../{valid_jpeg_test => valid.1.jpeg}              |  Bin 22219 -> 22219 bytes
 .../{valid_png_test => valid.1.png}                |  Bin 2755 -> 2755 bytes
 .../randomly-modified/{valid_ppm_1 => valid.1.ppm} |    0
 .../{valid_tga_test => valid.1.tga}                |  Bin 23679 -> 23679 bytes
 .../{valid_tiff1_test => valid.1.tiff}             |  Bin 1954 -> 1954 bytes
 .../randomly-modified/{valid.xbm => valid.1.xbm}   |    0
 .../{valid_xpm_test => valid.1.xpm}                |    0
 .../{valid_jpeg_progressive_test => valid.2.jpeg}  |  Bin 25206 -> 25206 bytes
 .../randomly-modified/{valid_ppm_2 => valid.2.ppm} |    0
 .../randomly-modified/{valid_ppm_3 => valid.3.ppm} |    0
 .../randomly-modified/{valid_ppm_4 => valid.4.ppm} |    0
 37 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/tests/pixbuf-scale.c b/tests/pixbuf-scale.c
index d1a1850..aa2180c 100644
--- a/tests/pixbuf-scale.c
+++ b/tests/pixbuf-scale.c
@@ -174,13 +174,13 @@ main (int argc, char **argv)
 {
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_data_func ("/pixbuf/scale/png", "test-images/randomly-modified/valid_png_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/bmp", "test-images/randomly-modified/valid_bmp_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/gif", "test-images/randomly-modified/valid_gif_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/jpeg", "test-images/randomly-modified/valid_jpeg_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/tga", "test-images/randomly-modified/valid_tga_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/xpm", "test-images/randomly-modified/valid_xpm_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/xbm", "test-images/randomly-modified/valid.xbm", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/png", "test-images/randomly-modified/valid.1.png", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/bmp", "test-images/randomly-modified/valid.1.bmp", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/gif", "test-images/randomly-modified/valid.1.gif", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/jpeg", "test-images/randomly-modified/valid.1.jpeg", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/tga", "test-images/randomly-modified/valid.1.tga", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/xpm", "test-images/randomly-modified/valid.1.xpm", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/xbm", "test-images/randomly-modified/valid.1.xbm", test_scale);
   g_test_add_data_func ("/pixbuf/scale/png/large", "large.png", test_scale_down);
   g_test_add_data_func ("/pixbuf/scale/jpeg/large", "large.jpg", test_scale_down);
   g_test_add_data_func ("/pixbuf/add-alpha/large", "large.png", test_add_alpha);
diff --git a/tests/pixbuf-threads.c b/tests/pixbuf-threads.c
index 1db139c..8ea15a1 100644
--- a/tests/pixbuf-threads.c
+++ b/tests/pixbuf-threads.c
@@ -73,21 +73,21 @@ test_threads (void)
   for (i = 0; i < iterations; i++)
     {
       if (format_supported ("jpeg"))
-        g_thread_pool_push (pool, "valid_jpeg_test", NULL);
+        g_thread_pool_push (pool, "valid.1.jpeg", NULL);
       if (format_supported ("png"))
-        g_thread_pool_push (pool, "valid_png_test", NULL);
+        g_thread_pool_push (pool, "valid.1.png", NULL);
       if (format_supported ("gif"))
-        g_thread_pool_push (pool, "valid_gif_test", NULL);
+        g_thread_pool_push (pool, "valid.1.gif", NULL);
       if (format_supported ("bmp"))
-        g_thread_pool_push (pool, "valid_bmp_test", NULL);
+        g_thread_pool_push (pool, "valid.1.bmp", NULL);
       if (format_supported ("jpeg"))
-        g_thread_pool_push (pool, "valid_jpeg_progressive_test", NULL);
+        g_thread_pool_push (pool, "valid.2.jpeg", NULL);
       if (format_supported ("xpm"))
-        g_thread_pool_push (pool, "valid_xpm_test", NULL);
+        g_thread_pool_push (pool, "valid.1.xpm", NULL);
       if (format_supported ("tga"))
-        g_thread_pool_push (pool, "valid_tga_test", NULL);
+        g_thread_pool_push (pool, "valid.1.tga", NULL);
       if (format_supported ("tiff"))
-        g_thread_pool_push (pool, "valid_tiff1_test", NULL);
+        g_thread_pool_push (pool, "valid.1.tiff", NULL);
     }
 
   g_thread_pool_free (pool, FALSE, TRUE);
diff --git a/tests/test-images/randomly-modified/invalid_gif_test_1 
b/tests/test-images/randomly-modified/invalid.1.gif
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_gif_test_1
rename to tests/test-images/randomly-modified/invalid.1.gif
diff --git a/tests/test-images/randomly-modified/invalid_png_test_1 
b/tests/test-images/randomly-modified/invalid.1.png
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_png_test_1
rename to tests/test-images/randomly-modified/invalid.1.png
diff --git a/tests/test-images/randomly-modified/invalid_ppm_1 
b/tests/test-images/randomly-modified/invalid.1.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ppm_1
rename to tests/test-images/randomly-modified/invalid.1.ppm
diff --git a/tests/test-images/randomly-modified/invalid_xpm_test_1 
b/tests/test-images/randomly-modified/invalid.1.xpm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_xpm_test_1
rename to tests/test-images/randomly-modified/invalid.1.xpm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_2 
b/tests/test-images/randomly-modified/invalid.2.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ppm_2
rename to tests/test-images/randomly-modified/invalid.2.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ico_test_3 
b/tests/test-images/randomly-modified/invalid.3.ico
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ico_test_3
rename to tests/test-images/randomly-modified/invalid.3.ico
diff --git a/tests/test-images/randomly-modified/invalid_ppm_3 
b/tests/test-images/randomly-modified/invalid.3.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ppm_3
rename to tests/test-images/randomly-modified/invalid.3.ppm
diff --git a/tests/test-images/randomly-modified/invalid_png_test_4 
b/tests/test-images/randomly-modified/invalid.4.png
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_png_test_4
rename to tests/test-images/randomly-modified/invalid.4.png
diff --git a/tests/test-images/randomly-modified/invalid_ppm_4 
b/tests/test-images/randomly-modified/invalid.4.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ppm_4
rename to tests/test-images/randomly-modified/invalid.4.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_5 
b/tests/test-images/randomly-modified/invalid.5.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ppm_5
rename to tests/test-images/randomly-modified/invalid.5.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_6 
b/tests/test-images/randomly-modified/invalid.6.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ppm_6
rename to tests/test-images/randomly-modified/invalid.6.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_7 
b/tests/test-images/randomly-modified/invalid.7.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ppm_7
rename to tests/test-images/randomly-modified/invalid.7.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_8 
b/tests/test-images/randomly-modified/invalid.8.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/invalid_ppm_8
rename to tests/test-images/randomly-modified/invalid.8.ppm
diff --git a/tests/test-images/randomly-modified/valid_ppm_1 b/tests/test-images/randomly-modified/valid.1.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/valid_ppm_1
rename to tests/test-images/randomly-modified/valid.1.ppm
diff --git a/tests/test-images/randomly-modified/valid.xbm b/tests/test-images/randomly-modified/valid.1.xbm
similarity index 100%
rename from tests/test-images/randomly-modified/valid.xbm
rename to tests/test-images/randomly-modified/valid.1.xbm
diff --git a/tests/test-images/randomly-modified/valid_xpm_test 
b/tests/test-images/randomly-modified/valid.1.xpm
similarity index 100%
rename from tests/test-images/randomly-modified/valid_xpm_test
rename to tests/test-images/randomly-modified/valid.1.xpm
diff --git a/tests/test-images/randomly-modified/valid_ppm_2 b/tests/test-images/randomly-modified/valid.2.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/valid_ppm_2
rename to tests/test-images/randomly-modified/valid.2.ppm
diff --git a/tests/test-images/randomly-modified/valid_ppm_3 b/tests/test-images/randomly-modified/valid.3.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/valid_ppm_3
rename to tests/test-images/randomly-modified/valid.3.ppm
diff --git a/tests/test-images/randomly-modified/valid_ppm_4 b/tests/test-images/randomly-modified/valid.4.ppm
similarity index 100%
rename from tests/test-images/randomly-modified/valid_ppm_4
rename to tests/test-images/randomly-modified/valid.4.ppm


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]