Icon names do not have an extension

4 files changed, 9 insertions, 12 deletions

diff --git a/tests/xdg-utils-usecases/t.01-default_mime_launch b/tests/xdg-utils-usecases/t.01-default_mime_launch
index 695c09b..42ba7e3 100755
--- a/tests/xdg-utils-usecases/t.01-default_mime_launch
+++ b/tests/xdg-utils-usecases/t.01-default_mime_launch
@@ -54,7 +54,7 @@ assert_nostderr
 
 # Verify application is as expected
 echo "$DESKTOP_FILE" >out.expected
-assert_exit 0 xdg-mime query default "$MIME_INPUT"
+assert_exit 0 xdg-mime query default "$MIME_TYPE"
 assert_stdout out.expected
 assert_nostderr
 
diff --git a/tests/xdg-utils-usecases/t.10-file_icon b/tests/xdg-utils-usecases/t.10-file_icon
index 27fc0bc..fe13ec5 100755
--- a/tests/xdg-utils-usecases/t.10-file_icon
+++ b/tests/xdg-utils-usecases/t.10-file_icon
@@ -30,7 +30,7 @@ test_procedure
 
 # install icons of all sizes
 for i in $ICON_SIZES; do
-	assert_exit 0 xdg-icon-resource install --context mimetypes --size "$i" "xdgtestdata-$XDG_TEST_ID-red-$i.png" "xdgtestdata-$MIME_MINOR.png"
+	assert_exit 0 xdg-icon-resource install --context mimetypes --size "$i" "xdgtestdata-$XDG_TEST_ID-red-$i.png" "xdgtestdata-$MIME_MINOR"
 	assert_nostdout
 	assert_nostderr
 done
@@ -54,7 +54,7 @@ fi
 
 # ask user to cycle through sizes & ensure correct icons are displayed.
 assert_interactive "Is a file named '$TEST_FILE' present in the directory?" y
-assert_interactive "Does the icon consist of a red number in the list {$ICON_SIZES}?\n\tThe number should roughly correspond to the icon size.\n\t(You may need to select something like 'View->As Icons')" y
+assert_interactive "Does the icon consist of a red number in the list {$ICON_SIZES}?\n\t(You may need to select something like 'View->As Icons')" y
 # assert_interactive "Does the number change appropriately when you increase or decrease the view size?" y
 
 ## cleanup
@@ -66,7 +66,7 @@ fi
 
 # remove icons
 for i in $ICON_SIZES; do
-	assert_exit 0 xdg-icon-resource uninstall --size "$i" "xdgtestdata-$MIME_MINOR.png"
+	assert_exit 0 xdg-icon-resource uninstall --context mimetypes --size "$i" "xdgtestdata-$MIME_MINOR"
 	assert_nostdout
 	assert_nostderr
 done
diff --git a/tests/xdg-utils-usecases/t.11-desktop_file_icon b/tests/xdg-utils-usecases/t.11-desktop_file_icon
index 2f98893..29ddf7d 100755
--- a/tests/xdg-utils-usecases/t.11-desktop_file_icon
+++ b/tests/xdg-utils-usecases/t.11-desktop_file_icon
@@ -27,7 +27,7 @@ test_procedure
 
 # install icons of all sizes
 for i in $ICON_SIZES; do
-	assert_exit 0 xdg-icon-resource install --size "$i" "xdgtestdata-$XDG_TEST_ID-red-$i.png" "$ICON_NAME.png"
+	assert_exit 0 xdg-icon-resource install --size "$i" "xdgtestdata-$XDG_TEST_ID-red-$i.png" "$ICON_NAME"
 	assert_nostdout
 	assert_nostderr
 done
@@ -45,7 +45,7 @@ fi
 
 # ask user to cycle through sizes & ensure correct icons are displayed.
 assert_interactive "Is a file named 'Icon Test' present in the directory?" y
-assert_interactive "Does the icon consist of a red number in the list {$ICON_SIZES}?\n\tThe number should roughly correspond to the icon size.\n\t(You may need to select something like 'View->As Icons')" y
+assert_interactive "Does the icon consist of a red number in the list {$ICON_SIZES}?\n\t(You may need to select something like 'View->As Icons')" y
 # assert_interactive "Does the number change appropriately when you increase or decrease the view size?" y
 
 ## cleanup
@@ -57,12 +57,9 @@ fi
 
 # remove icons
 for i in $ICON_SIZES; do
-	assert_exit 0 xdg-icon-resource uninstall --size "$i" "$ICON_NAME.png"
-	assert_nostdout
-	assert_nostderr
+	xdg-icon-resource uninstall --size "$i" "$ICON_NAME" > /dev/null 2> /dev/null
 done
 
-
 test_result
 }
 
diff --git a/tests/xdg-utils-usecases/t.12-svg_icon_render b/tests/xdg-utils-usecases/t.12-svg_icon_render
index 40b4515..93e9073 100755
--- a/tests/xdg-utils-usecases/t.12-svg_icon_render
+++ b/tests/xdg-utils-usecases/t.12-svg_icon_render
@@ -26,7 +26,7 @@ TEST_DIR="$XDG_TEST_TMPDIR"
 test_procedure
 
 # install icons of all sizes
-assert_exit 0 xdg-icon-resource install "$ICON_FILE" "$ICON_NAME.svg"
+assert_exit 0 xdg-icon-resource install "$ICON_FILE" "$ICON_NAME"
 assert_nostdout
 assert_nostderr
 
@@ -53,7 +53,7 @@ else
 fi
 
 # remove icons
-assert_exit 0 xdg-icon-resource uninstall  "$ICON_NAME.svg"
+assert_exit 0 xdg-icon-resource uninstall  "$ICON_NAME"
 assert_nostdout
 assert_nostderr