Update tests for icon sizes being a rule

Author: fwsmit

src/icon.c

@@ -122,6 +122,8 @@ cairo_surface_t *gdk_pixbuf_to_cairo_surface(GdkPixbuf *pixbuf)
  *
  * @param w a pointer to the image width, to be modified in-place
  * @param h a pointer to the image height, to be modified in-place
+ * @param min_size the minimum icon size setting for this notification
+ * @param max_size the maximum icon size setting for this notification
  * @return TRUE if the dimensions were updated, FALSE if they were left unchanged
  */
 static bool icon_size_clamp(int *w, int *h, int min_size, int max_size) {

src/icon.h

@@ -56,7 +56,7 @@ char *get_path_from_icon_name(const char *iconname, int size);
  *             like described in the notification spec.
  * @param id   (necessary) A unique identifier of the returned pixbuf.
  *             Only filled, if the return value is non-NULL.
- * @param scale An integer representing the output dpi scaling.
+ * @param dpi_scale An integer representing the output dpi scaling.
  * @param min_size An integer representing the desired minimum unscaled icon size.
  * @param max_size An integer representing the desired maximum unscaled icon size.
  * @return an instance of `GdkPixbuf` derived from the GVariant

test/icon.c

@@ -38,43 +38,43 @@ TEST test_get_path_from_icon_name_full(void)
         PASS();
 }
 
-TEST test_icon_size_clamp_too_small(void)
+TEST test_icon_size_clamp_too_small(int min_icon_size, int max_icon_size)
 {
         int w = 12, h = 24;
-        bool resized = icon_size_clamp(&w, &h);
+        bool resized = icon_size_clamp(&w, &h, min_icon_size, max_icon_size);
         ASSERT(resized);
         ASSERT_EQ(w, 16);
         ASSERT_EQ(h, 32);
 
         PASS();
 }
 
-TEST test_icon_size_clamp_not_necessary(void)
+TEST test_icon_size_clamp_not_necessary(int min_icon_size, int max_icon_size)
 {
         int w = 20, h = 30;
-        bool resized = icon_size_clamp(&w, &h);
+        bool resized = icon_size_clamp(&w, &h, min_icon_size, max_icon_size);
         ASSERT(!resized);
         ASSERT_EQ(w, 20);
         ASSERT_EQ(h, 30);
 
         PASS();
 }
 
-TEST test_icon_size_clamp_too_big(void)
+TEST test_icon_size_clamp_too_big(int min_icon_size, int max_icon_size)
 {
         int w = 75, h = 150;
-        bool resized = icon_size_clamp(&w, &h);
+        bool resized = icon_size_clamp(&w, &h, min_icon_size, max_icon_size);
         ASSERT(resized);
         ASSERT_EQ(w, 50);
         ASSERT_EQ(h, 100);
 
         PASS();
 }
 
-TEST test_icon_size_clamp_too_small_then_too_big(void)
+TEST test_icon_size_clamp_too_small_then_too_big(int min_icon_size, int max_icon_size)
 {
         int w = 8, h = 80;
-        bool resized = icon_size_clamp(&w, &h);
+        bool resized = icon_size_clamp(&w, &h, min_icon_size, max_icon_size);
         ASSERT(resized);
         ASSERT_EQ(w, 10);
         ASSERT_EQ(h, 100);
@@ -90,30 +90,19 @@ SUITE(suite_icon)
         printf("Icon path: %s\n", icon_path);
         RUN_TEST(test_get_path_from_icon_null);
         RUN_TEST(test_get_path_from_icon_name_full);
-        RUN_TEST(test_icon_size_clamp_not_necessary);
+        RUN_TESTp(test_icon_size_clamp_not_necessary, 0, 100);
 
-        settings.min_icon_size = 16;
-        settings.max_icon_size = 100;
+        RUN_TESTp(test_icon_size_clamp_too_small, 16, 100);
+        RUN_TESTp(test_icon_size_clamp_not_necessary, 16, 100);
+        RUN_TESTp(test_icon_size_clamp_too_big, 16, 100);
+        RUN_TESTp(test_icon_size_clamp_too_small_then_too_big, 16, 100);
 
-        RUN_TEST(test_icon_size_clamp_too_small);
-        RUN_TEST(test_icon_size_clamp_not_necessary);
-        RUN_TEST(test_icon_size_clamp_too_big);
-        RUN_TEST(test_icon_size_clamp_too_small_then_too_big);
+        RUN_TESTp(test_icon_size_clamp_too_small, 16, 0);
+        RUN_TESTp(test_icon_size_clamp_not_necessary, 16, 0);
 
-        settings.min_icon_size = 16;
-        settings.max_icon_size = 0;
+        RUN_TESTp(test_icon_size_clamp_not_necessary, 0, 100);
+        RUN_TESTp(test_icon_size_clamp_too_big, 0, 100);
 
-        RUN_TEST(test_icon_size_clamp_too_small);
-        RUN_TEST(test_icon_size_clamp_not_necessary);
-
-        settings.min_icon_size = 0;
-        settings.max_icon_size = 100;
-
-        RUN_TEST(test_icon_size_clamp_not_necessary);
-        RUN_TEST(test_icon_size_clamp_too_big);
-
-        settings.min_icon_size = 0;
-        settings.max_icon_size = 0;
         g_clear_pointer(&icon_path, g_free);
 }
 /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */

test/notification.c

@@ -137,11 +137,9 @@ static struct notification *notification_load_icon_with_scaling(int min_icon_siz
 
         GVariant *rawIcon = notification_setup_raw_image(path);
 
-        settings.min_icon_size = min_icon_size;
-        settings.max_icon_size = max_icon_size;
+        n->min_icon_size = min_icon_size;
+        n->max_icon_size = max_icon_size;
         notification_icon_replace_data(n, rawIcon);
-        settings.min_icon_size = 0;
-        settings.max_icon_size = 0;
 
         g_variant_unref(rawIcon);
         g_free(path);