Add a test for extracting relative symlinks

10 files changed, 33 insertions, 21 deletions

diff --git a/data/tests/Makefile.am b/data/tests/Makefile.am
index abf1686..589ea5a 100644
--- a/data/tests/Makefile.am
+++ b/data/tests/Makefile.am
@@ -4,10 +4,10 @@ test_files =						\
 	alpha-internal1.png				\
 	alpha-internal2.png				\
 	alpha-vert.png					\
-	app-1-1.fc21.i686.rpm				\
-	app-1-1.fc21.x86_64.rpm				\
-	app-console-1-1.fc21.noarch.rpm			\
-	app-extra-1-1.fc21.noarch.rpm			\
+	app-1-1.fc25.i686.rpm				\
+	app-1-1.fc25.x86_64.rpm				\
+	app-console-1-1.fc25.noarch.rpm			\
+	app-extra-1-1.fc25.noarch.rpm			\
 	appstream.xml					\
 	asb-self-test.xml.gz				\
 	broken.appdata.xml				\
diff --git a/data/tests/app-1-1.fc21.i686.rpm b/data/tests/app-1-1.fc21.i686.rpm
deleted file mode 100644
index 478333c..0000000
--- a/data/tests/app-1-1.fc21.i686.rpm
+++ /dev/null
diff --git a/data/tests/app-1-1.fc21.x86_64.rpm b/data/tests/app-1-1.fc21.x86_64.rpm
deleted file mode 100644
index a85dfda..0000000
--- a/data/tests/app-1-1.fc21.x86_64.rpm
+++ /dev/null
diff --git a/data/tests/app-1-1.fc25.i686.rpm b/data/tests/app-1-1.fc25.i686.rpm
new file mode 100644
index 0000000..c3166b5
--- /dev/null
+++ b/data/tests/app-1-1.fc25.i686.rpm
diff --git a/data/tests/app-1-1.fc25.x86_64.rpm b/data/tests/app-1-1.fc25.x86_64.rpm
new file mode 100644
index 0000000..ac601ce
--- /dev/null
+++ b/data/tests/app-1-1.fc25.x86_64.rpm
diff --git a/data/tests/app-console-1-1.fc21.noarch.rpm b/data/tests/app-console-1-1.fc25.noarch.rpm
index e0b6c0d..d05cda0 100644
--- a/data/tests/app-console-1-1.fc21.noarch.rpm
+++ b/data/tests/app-console-1-1.fc25.noarch.rpm
diff --git a/data/tests/app-extra-1-1.fc21.noarch.rpm b/data/tests/app-extra-1-1.fc25.noarch.rpm
index e8dd104..477d303 100644
--- a/data/tests/app-extra-1-1.fc21.noarch.rpm
+++ b/data/tests/app-extra-1-1.fc25.noarch.rpm
diff --git a/data/tests/app.spec b/data/tests/app.spec
index efc3adf..26dbfb9 100644
--- a/data/tests/app.spec
+++ b/data/tests/app.spec
@@ -6,7 +6,6 @@ URL:		http://people.freedesktop.org/
 License:	GPLv2+
 Source0:	README
 Source1:	app.desktop
-Source2:	app.png
 Source3:	app.appdata.xml
 Source4:	search-provider.ini
 Source5:	index.page
@@ -21,6 +20,8 @@ Source13:	app.notifyrc
 Source14:	app.bin
 Source15:	console1.desktop
 Source16:	console2.desktop
+Source17:	app.png
+Source18:	app-128x128.png
 
 %description
 This is a test application.
@@ -45,11 +46,18 @@ Sub package with console "application".
 install -Dp %{SOURCE0} $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{version}/README
 install -Dp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/applications/app.desktop
 
-# test decompressing a symlink destination
-install -Dp %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/app/app.png
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
+# test decompressing an absolute symlink destination
+install -Dp %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/app/app-48x48.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 cd $RPM_BUILD_ROOT
-ln -s %{_datadir}/app/app.png usr/share/pixmaps/app.png
+ln -s %{_datadir}/app/app-48x48.png usr/share/icons/hicolor/48x48/apps/app.png
+cd -
+
+# test decompressing a relative symlink destination
+install -Dp %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/app/app-128x128.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+cd $RPM_BUILD_ROOT
+ln -s ../../../../app/app-128x128.png usr/share/icons/hicolor/128x128/apps/app.png
 cd -
 
 install -Dp %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/appdata/app.appdata.xml
@@ -82,8 +90,10 @@ install -Dp %{SOURCE16} $RPM_BUILD_ROOT/%{_datadir}/applications/console2.deskto
 %{_datadir}/kde4/apps/app/app.notifyrc
 %{_datadir}/locale/en_GB/LC_MESSAGES/app.mo
 %{_datadir}/locale/ru/LC_MESSAGES/app.mo
-%{_datadir}/app/app.png
-%{_datadir}/pixmaps/app.png
+%{_datadir}/app/app-48x48.png
+%{_datadir}/app/app-128x128.png
+%{_datadir}/icons/hicolor/48x48/apps/app.png
+%{_datadir}/icons/hicolor/128x128/apps/app.png
 
 %files extra
 %{_datadir}/appdata/app-extra.metainfo.xml
diff --git a/data/tests/rpmbuild/app-128x128.png b/data/tests/rpmbuild/app-128x128.png
new file mode 100644
index 0000000..9abdeba
--- /dev/null
+++ b/data/tests/rpmbuild/app-128x128.png
diff --git a/libappstream-builder/asb-self-test.c b/libappstream-builder/asb-self-test.c
index 1c60322..572b53e 100644
--- a/libappstream-builder/asb-self-test.c
+++ b/libappstream-builder/asb-self-test.c
@@ -324,10 +324,10 @@ asb_test_context_test_func (AsbTestContextMode mode)
 	g_autoptr(GString) xml_ignore = NULL;
 	const gchar *filenames[] = {
 		"test-0.1-1.fc21.noarch.rpm",		/* a console app */
-		"app-1-1.fc21.x86_64.rpm",		/* a GUI app */
-		"app-extra-1-1.fc21.noarch.rpm",	/* addons for a GUI app */
-		"app-console-1-1.fc21.noarch.rpm",	/* app with no icon */
-		"app-1-1.fc21.i686.rpm",		/* GUI multiarch app */
+		"app-1-1.fc25.x86_64.rpm",		/* a GUI app */
+		"app-extra-1-1.fc25.noarch.rpm",	/* addons for a GUI app */
+		"app-console-1-1.fc25.noarch.rpm",	/* app with no icon */
+		"app-1-1.fc25.i686.rpm",		/* GUI multiarch app */
 		"composite-1-1.fc21.x86_64.rpm",	/* multiple GUI apps */
 		"font-1-1.fc21.noarch.rpm",		/* font */
 		"font-serif-1-1.fc21.noarch.rpm",	/* font that extends */
@@ -473,7 +473,7 @@ asb_test_context_test_func (AsbTestContextMode mode)
 		"<url type=\"homepage\">http://people.freedesktop.org/</url>\n"
 		"<extends>app.desktop</extends>\n"
 		"<metadata>\n"
-		"<value key=\"X-CacheID\">app-1-1.fc21.x86_64.rpm</value>\n"
+		"<value key=\"X-CacheID\">app-1-1.fc25.x86_64.rpm</value>\n"
 		"</metadata>\n"
 		"</component>\n"
 		"<component type=\"addon\">\n"
@@ -486,7 +486,7 @@ asb_test_context_test_func (AsbTestContextMode mode)
 		"<url type=\"homepage\">http://people.freedesktop.org/</url>\n"
 		"<extends>app.desktop</extends>\n"
 		"<metadata>\n"
-		"<value key=\"X-CacheID\">app-extra-1-1.fc21.noarch.rpm</value>\n"
+		"<value key=\"X-CacheID\">app-extra-1-1.fc25.noarch.rpm</value>\n"
 		"</metadata>\n"
 		"</component>\n"
 		"<component type=\"desktop\">\n"
@@ -495,6 +495,7 @@ asb_test_context_test_func (AsbTestContextMode mode)
 		"<name>App</name>\n"
 		"<summary>A test application</summary>\n"
 		"<description><p>Long description goes here.</p></description>\n"
+		"<icon type=\"cached\" height=\"128\" width=\"128\">app.png</icon>\n"
 		"<icon type=\"cached\" height=\"64\" width=\"64\">app.png</icon>\n"
 		"<categories>\n"
 		"<category>Profiling</category>\n"
@@ -505,6 +506,7 @@ asb_test_context_test_func (AsbTestContextMode mode)
 		"<keyword>Remote</keyword>\n"
 		"</keywords>\n"
 		"<kudos>\n"
+		"<kudo>HiDpiIcon</kudo>\n"
 		"<kudo>ModernToolkit</kudo>\n"
 		"<kudo>SearchProvider</kudo>\n"
 		"<kudo>UserDocs</kudo>\n"
@@ -527,7 +529,7 @@ asb_test_context_test_func (AsbTestContextMode mode)
 		"<lang percentage=\"33\">ru</lang>\n"
 		"</languages>\n"
 		"<metadata>\n"
-		"<value key=\"X-CacheID\">app-1-1.fc21.x86_64.rpm</value>\n"
+		"<value key=\"X-CacheID\">app-1-1.fc25.x86_64.rpm</value>\n"
 		"</metadata>\n"
 		"</component>\n"
 #ifdef HAVE_GCAB
@@ -641,14 +643,14 @@ asb_test_context_test_func (AsbTestContextMode mode)
 		"<id>app-console.noarch</id>\n"
 		"<pkgname>app-console</pkgname>\n"
 		"<metadata>\n"
-		"<value key=\"X-CacheID\">app-console-1-1.fc21.noarch.rpm</value>\n"
+		"<value key=\"X-CacheID\">app-console-1-1.fc25.noarch.rpm</value>\n"
 		"</metadata>\n"
 		"</component>\n"
 		"<component type=\"generic\">\n"
 		"<id>app.i686</id>\n"
 		"<pkgname>app</pkgname>\n"
 		"<metadata>\n"
-		"<value key=\"X-CacheID\">app-1-1.fc21.i686.rpm</value>\n"
+		"<value key=\"X-CacheID\">app-1-1.fc25.i686.rpm</value>\n"
 		"</metadata>\n"
 		"</component>\n"
 		"<component type=\"generic\">\n"
@@ -679,8 +681,8 @@ asb_test_context_test_func (AsbTestContextMode mode)
 
 	/* check icon dir */
 	g_assert (g_file_test ("/tmp/asbuilder/temp/icons/64x64/app.png", G_FILE_TEST_EXISTS));
+	g_assert (g_file_test ("/tmp/asbuilder/temp/icons/128x128/app.png", G_FILE_TEST_EXISTS));
 	g_assert (!g_file_test ("/tmp/asbuilder/temp/icons/app.png", G_FILE_TEST_EXISTS));
-	g_assert (!g_file_test ("/tmp/asbuilder/temp/icons/128x128/app.png", G_FILE_TEST_EXISTS));
 }
 #endif