tests: Add a test for compose policy argument

Author: bbhtt

tests/Makefile.am.inc

@@ -61,6 +61,8 @@ dist_installed_test_data = \
 	tests/org.flatpak_builder.gui.desktop \
 	tests/org.flatpak_builder.gui.json \
 	tests/org.flatpak_builder.gui.metainfo.xml \
+	tests/org.flatpak.appstream_media.json \
+	tests/org.test.Hello-256.png \
 	$(NULL)
 
 installed_test_keyringdir = $(installed_testdir)/test-keyring

tests/libtest.sh

@@ -309,6 +309,47 @@ skip_without_python2 () {
     fi
 }
 
+appstream_has_version () {
+    req_major=$1
+    req_minor=$2
+    req_micro=$3
+
+    maj=0; min=0; mic=0
+
+    out=$(appstreamcli --version 2>/dev/null) || return 1
+
+    while IFS= read -r line; do
+        case "$line" in
+            "AppStream library version:"* )
+                ver=$(echo "$line" | awk '{print $4}')
+                ;;
+            "AppStream version:"* )
+                ver=$(echo "$line" | awk '{print $3}')
+                ;;
+            * ) continue ;;
+        esac
+
+        maj=$(echo "$ver" | cut -d. -f1)
+        min=$(echo "$ver" | cut -d. -f2)
+        mic=$(echo "$ver" | cut -d. -f3)
+        break
+    done <<EOF
+$out
+EOF
+
+    if [ "$maj" -gt "$req_major" ]; then
+        return 0
+    elif [ "$maj" -eq "$req_major" ]; then
+        if [ "$min" -gt "$req_minor" ]; then
+            return 0
+        elif [ "$min" -eq "$req_minor" ]; then
+            [ "$mic" -ge "$req_micro" ] && return 0
+        fi
+    fi
+
+    return 1
+}
+
 cleanup () {
     gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye >&2 || true
     if test -n "${TEST_SKIP_CLEANUP:-}"; then

tests/meson.build

@@ -108,6 +108,8 @@ if get_option('installed_tests')
     'org.flatpak_builder.gui.desktop',
     'org.flatpak_builder.gui.json',
     'org.flatpak_builder.gui.metainfo.xml',
+    'org.flatpak.appstream_media.json',
+    'org.test.Hello-256.png',
 
     install_dir: installed_testdir,
     install_mode: 'rw-r--r--',

tests/org.flatpak.appstream_media.json

@@ -0,0 +1,44 @@
+{
+    "id": "org.flatpak.appstream_media",
+    "runtime": "org.test.Platform",
+    "sdk": "org.test.Sdk",
+    "rename-desktop-file": "org.flatpak_builder.gui.desktop",
+    "rename-appdata-file": "org.flatpak_builder.gui.metainfo.xml",
+    "rename-icon": "org.test.Hello-256",
+    "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 org.flatpak_builder.gui.metainfo.xml ${FLATPAK_DEST}/share/metainfo",
+                "cp -vf org.flatpak_builder.gui.desktop ${FLATPAK_DEST}/share/applications",
+                "cp -vf org.test.Hello-256.png ${FLATPAK_DEST}/share/icons/hicolor/256x256/apps"
+            ],
+            "sources": [
+                {
+                    "type": "script",
+                    "dest-filename": "hello.sh",
+                    "commands": [
+                        "echo \"Hello world, from a sandbox\""
+                    ]
+                },
+                {
+                    "type": "file",
+                    "path": "org.flatpak_builder.gui.desktop"
+                },
+                {
+                    "type": "file",
+                    "path": "org.flatpak_builder.gui.metainfo.xml"
+                },
+                {
+                    "type": "file",
+                    "path": "org.test.Hello-256.png"
+                }
+            ]
+        }
+    ]
+}

tests/org.test.Hello-256.png

@@ -23,7 +23,7 @@ set -euo pipefail
 
 skip_without_fuse
 
-echo "1..8"
+echo "1..10"
 
 setup_repo
 install_repo
@@ -53,6 +53,8 @@ cp $(dirname $0)/org.flatpak_builder.gui.desktop .
 cp $(dirname $0)/org.flatpak_builder.gui.json .
 cp $(dirname $0)/org.flatpak_builder.gui.metainfo.xml .
 cp $(dirname $0)/org.test.Hello.png .
+cp $(dirname $0)/org.test.Hello-256.png .
+cp $(dirname $0)/org.flatpak.appstream_media.json .
 mkdir include1
 cp $(dirname $0)/module1.json include1/
 cp $(dirname $0)/module1.yaml include1/
@@ -144,3 +146,30 @@ 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 policy
+${FLATPAK_BUILDER} --force-clean builddir_sc \
+    --mirror-screenshots-url=https://example.org/media \
+    --state-dir .fp-compose-url-policy-partial \
+    --compose-url-policy=partial \
+    org.flatpak.appstream_media.json >&2
+# we test for the icon tag instead of screenshot
+# the former works offline the latter does not
+gzip -cdq builddir_sc/files/share/app-info/xmls/org.flatpak.appstream_media.xml.gz|grep -Eq '>org/flatpak/appstream_media/[^/]+/icons/128x128/org.flatpak.appstream_media.png</icon>'
+
+echo "ok compose partial url policy"
+
+# test compose full url policy
+if appstream_has_version 0 16 3; then
+    ${FLATPAK_BUILDER} --force-clean builddir_sc \
+        --mirror-screenshots-url=https://example.org/media \
+        --state-dir .fp-compose-url-policy-full \
+        --compose-url-policy=full \
+        org.flatpak.appstream_media.json >&2
+
+    gzip -cdq builddir_sc/files/share/app-info/xmls/org.flatpak.appstream_media.xml.gz|grep -Eq '>https://example.org/media/org/flatpak/appstream_media/[^/]+/icons/128x128/org.flatpak.appstream_media.png</icon>'
+
+    echo "ok compose full url policy"
+else
+    echo "ok # Skip AppStream < 0.16.3"
+fi