tests: Add a test for compose policy argument

Author: bbhtt

tests/Makefile.am.inc

@@ -58,9 +58,11 @@ dist_installed_test_data = \
 	tests/org.test.Deprecated.SHA1.file.yaml \
 	tests/hello.sh \
 	tests/hello.tar.xz \
-	tests/org.flatpak_builder.gui.desktop \
+	tests/org.flatpak.appstream_media.desktop \
 	tests/org.flatpak_builder.gui.json \
-	tests/org.flatpak_builder.gui.metainfo.xml \
+	tests/org.flatpak.appstream_media.metainfo.xml \
+	tests/org.flatpak.appstream_media.json \
+	tests/org.test.Hello-256.png \
 	$(NULL)
 
 installed_test_keyringdir = $(installed_testdir)/test-keyring

tests/meson.build

@@ -105,9 +105,11 @@ if get_option('installed_tests')
     'test-runtime.json',
     'test.json',
     'test.yaml',
-    'org.flatpak_builder.gui.desktop',
+    'org.flatpak.appstream_media.desktop',
     'org.flatpak_builder.gui.json',
-    'org.flatpak_builder.gui.metainfo.xml',
+    'org.flatpak.appstream_media.metainfo.xml',
+    'org.flatpak.appstream_media.json',
+    'org.test.Hello-256.png',
 
     install_dir: installed_testdir,
     install_mode: 'rw-r--r--',

tests/org.flatpak_builder.gui.desktop renamed to tests/org.flatpak.appstream_media.desktop

@@ -3,7 +3,7 @@ Name=Example
 GenericName=Example
 Comment=Example
 Exec=hello %U
-Icon=org.flatpak_builder.gui
+Icon=org.flatpak.appstream_media
 Type=Application
 Categories=Network;
 Version=1.1

tests/org.flatpak.appstream_media.json

@@ -0,0 +1,41 @@
+{
+    "id": "org.flatpak.appstream_media",
+    "runtime": "org.test.Platform",
+    "sdk": "org.test.Sdk",
+    "command": "hello",
+    "modules": [
+        {
+            "name": "appstream_media",
+            "buildsystem": "simple",
+            "build-commands": [
+                "mkdir -p ${FLATPAK_DEST}/bin ${FLATPAK_DEST}/share/metainfo ${FLATPAK_DEST}/share/applications",
+                "mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/256x256/apps",
+                "cp -vf hello.sh ${FLATPAK_DEST}/bin/hello",
+                "cp -vf ${FLATPAK_ID}.metainfo.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml",
+                "cp -vf ${FLATPAK_ID}.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop",
+                "cp -vf org.test.Hello-256.png ${FLATPAK_DEST}/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png"
+            ],
+            "sources": [
+                {
+                    "type": "script",
+                    "dest-filename": "hello.sh",
+                    "commands": [
+                        "echo \"Hello world, from a sandbox\""
+                    ]
+                },
+                {
+                    "type": "file",
+                    "path": "org.flatpak.appstream_media.desktop"
+                },
+                {
+                    "type": "file",
+                    "path": "org.flatpak.appstream_media.metainfo.xml"
+                },
+                {
+                    "type": "file",
+                    "path": "org.test.Hello-256.png"
+                }
+            ]
+        }
+    ]
+}

tests/org.flatpak_builder.gui.metainfo.xml renamed to tests/org.flatpak.appstream_media.metainfo.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>org.flatpak_builder.gui</id>
-  <launchable type="desktop-id">org.flatpak_builder.gui.desktop</launchable>
+  <id>org.flatpak.appstream_media</id>
+  <launchable type="desktop-id">org.flatpak.appstream_media.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
-  <name>org.flatpak_builder.gui</name>
+  <name>org.flatpak.appstream_media</name>
   <developer_name>Flatpak</developer_name>
   <summary>Foo foo foo foo</summary>
   <url type="homepage">https://flatpak.org</url>

tests/org.test.Hello-256.png

@@ -23,7 +23,7 @@ set -euo pipefail
 
 skip_without_fuse
 
-echo "1..8"
+echo "1..9"
 
 setup_repo
 install_repo
@@ -144,3 +144,13 @@ ostree checkout --repo=$REPO/repo_sc -U screenshots/$(flatpak --default-arch) ou
 find outdir_sc -path "*/icons/64x64/org.test.Hello.png" -type f | grep -q .
 
 echo "ok screenshot ref commit"
+
+# test compose partial url
+${FLATPAK_BUILDER} --force-clean builddir_sc \
+    --mirror-screenshots-url=https://example.org/media \
+    --state-dir .fp-compose-url-policy \
+    --compose-url-policy=partial \
+    org.flatpak.appstream_media.json >&2
+gzip -cdq builddir_sc/files/share/app-info/xmls/org.flatpak.appstream_media.xml.gz|grep -Eq '>org/flatpak_builder/appstream_media/[^/]+/icons/128x128/org.flatpak.appstream_media.png</icon>'
+
+echo "ok compose partial url"