4 files changed, 46 insertions, 7 deletions
diff --git a/tests/ECMAddAppIconTest/128-category-name-sidebar.png b/tests/ECMAddAppIconTest/128-category-name-sidebar.png
new file mode 100644
index 00000000..fa32c2a5
--- /dev/null
+++ b/tests/ECMAddAppIconTest/128-category-name-sidebar.png
diff --git a/tests/ECMAddAppIconTest/16-category-name-sidebar.png b/tests/ECMAddAppIconTest/16-category-name-sidebar.png
new file mode 100644
index 00000000..4d7b7ddb
--- /dev/null
+++ b/tests/ECMAddAppIconTest/16-category-name-sidebar.png
diff --git a/tests/ECMAddAppIconTest/CMakeLists.txt b/tests/ECMAddAppIconTest/CMakeLists.txt
index dc556c1d..93dfd562 100644
--- a/tests/ECMAddAppIconTest/CMakeLists.txt
+++ b/tests/ECMAddAppIconTest/CMakeLists.txt
@@ -8,18 +8,57 @@ set(CMAKE_MODULE_PATH
 
 include(ECMAddAppIcon)
 
-set(ICONS 16-category-name.png 128-category-name.png)
+if(WIN32)
+    set(icon_extension_to_test "rc")
+elseif(APPLE)
+    set(icon_extension_to_test "icns")
+endif()
+
+#### Test 1: ecm_add_app_icon with only regular icons and no OUTFILE_BASENAME ####
+set(ICONS_1 16-category-name.png 128-category-name.png)
+ecm_add_app_icon(OUT_1 ICONS ${ICONS_1})
+
+if(WIN32 OR APPLE)
+    list(LENGTH OUT_1 out_count)
+    if(out_count EQUAL 0)
+        message(FATAL_ERROR "ecm_add_app_icon() hasn't produced anything")
+    endif()
+
+
+    if(NOT OUT_1 MATCHES "OUT_1.${icon_extension_to_test}")
+        message(FATAL_ERROR "ecm_add_app_icon() did not fall back to target name for icon name: ${OUT_1}")
+    endif()
+endif()
+
+add_custom_target(t_1 ALL DEPENDS ${OUT_1})
+list(APPEND OUT "${OUT_1}")
+
+#### Test 2: ecm_add_app_icon with regular and sidebar icons and OUTFILE_BASENAME set ####
+set(ICONS_2 16-category-name.png 128-category-name.png)
+set(SIDEBAR_ICONS_2 16-category-name-sidebar.png 128-category-name-sidebar.png)
 
-ecm_add_app_icon(OUT ICONS ${ICONS})
+ecm_add_app_icon(OUT_2 ICONS ${ICONS_2} SIDEBAR_ICONS ${SIDEBAR_ICONS_2} OUTFILE_BASENAME "SuperBasename")
 
 if(WIN32 OR APPLE)
-    list(LENGTH OUT out_count)
+    list(LENGTH OUT_2 out_count)
     if(out_count EQUAL 0)
-        message(FATAL_ERROR "ecm_add_app_icon() haven't produced anything")
+        message(FATAL_ERROR "ecm_add_app_icon() hasn't produced anything")
     endif()
+
+    if(NOT OUT_2 MATCHES "SuperBasename.${icon_extension_to_test}")
+        message(FATAL_ERROR "ecm_add_app_icon() did not respect OUTFILE_BASENAME: ${OUT_2}")
+    endif()
+endif()
+
+if(APPLE)
+    list(APPEND expected_icons "icon_16x16.png" "icon_128x128.png" "sidebar_16x16.png" "sidebar_32x32.png")
+    foreach(expected_icon ${expected_icons})
+        list(APPEND OUT_2 "${CMAKE_CURRENT_BINARY_DIR}/SuperBasename.iconset/${expected_icon}")
+    endforeach()
 endif()
 
-add_custom_target(t ALL DEPENDS ${OUT})
+add_custom_target(t_2 ALL DEPENDS ${OUT_2})
+list(APPEND OUT "${OUT_2}")
 
-# this will be run by CTest
+#### this will be run by CTest ####
 configure_file(check_files.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/check_files.cmake" @ONLY)
diff --git a/tests/ECMAddAppIconTest/check_files.cmake.in b/tests/ECMAddAppIconTest/check_files.cmake.in
index e7beb272..09f98315 100644
--- a/tests/ECMAddAppIconTest/check_files.cmake.in
+++ b/tests/ECMAddAppIconTest/check_files.cmake.in
@@ -6,4 +6,4 @@ foreach(f ${FILES})
         message(SEND_ERROR "${f} was not found")
     endif()
 endforeach()
-endif()
-\ No newline at end of file
+endif()