Rename everything but the on-disk location to flatpak

10 files changed, 55 insertions, 86 deletions

diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc
index c9ef3f1..dc30509 100644
--- a/tests/Makefile.am.inc
+++ b/tests/Makefile.am.inc
@@ -1,7 +1,7 @@
 TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
 	FLATPAK_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \
 	FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/bwrap \
-	FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/xdg-dbus-proxy \
+	FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy \
 	GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
 	LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
 	PATH=$$(cd $(top_builddir) && pwd):$${PATH} \
@@ -25,22 +25,22 @@ test_doc_portal_LDADD = \
              $(NULL)
 test_doc_portal_SOURCES = tests/test-doc-portal.c $(xdp_dbus_built_sources)
 
-EXTRA_test_doc_portal_DEPENDENCIES = tests/services/org.freedesktop.portal.Documents.service  tests/services/org.freedesktop.XdgApp.service
+EXTRA_test_doc_portal_DEPENDENCIES = tests/services/org.freedesktop.portal.Documents.service  tests/services/org.freedesktop.Flatpak.service
 
 tests/services/org.freedesktop.portal.Documents.service: document-portal/org.freedesktop.portal.Documents.service.in
 	mkdir -p tests/services
 	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@
 
-tests/services/org.freedesktop.XdgApp.service: session-helper/org.freedesktop.XdgApp.service.in
+tests/services/org.freedesktop.Flatpak.service: session-helper/org.freedesktop.Flatpak.service.in
 	mkdir -p tests/services
 	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)|" $< > $@
 
-tests/libtest.sh: tests/services/org.freedesktop.portal.Documents.service  tests/services/org.freedesktop.XdgApp.service
+tests/libtest.sh: tests/services/org.freedesktop.portal.Documents.service  tests/services/org.freedesktop.Flatpak.service
 
 install-test-data-hook:
 if ENABLE_INSTALLED_TESTS
 	mkdir -p $(DESTDIR)$(installed_testdir)/services
-	ln -sf $(dbus_servicedir)/org.freedesktop.XdgApp.service $(DESTDIR)$(installed_testdir)/services/
+	ln -sf $(dbus_servicedir)/org.freedesktop.Flatpak.service $(DESTDIR)$(installed_testdir)/services/
 	ln -sf $(dbus_servicedir)/org.freedesktop.portal.Documents.service $(DESTDIR)$(installed_testdir)/services/
 endif
 
@@ -76,9 +76,9 @@ test_scripts = \
 test_programs = testdb test-doc-portal
 
 @VALGRIND_CHECK_RULES@
-VALGRIND_SUPPRESSIONS_FILES=tests/xdg-app.supp
-EXTRA_DIST += tests/xdg-app.supp tests/dbs/no_tables
+VALGRIND_SUPPRESSIONS_FILES=tests/flatpak-valgrind.supp
+EXTRA_DIST += tests/flatpak-valgrind.supp tests/dbs/no_tables
 CLEANFILES += \
-	tests/services/org.freedesktop.XdgApp.service \
+	tests/services/org.freedesktop.Flatpak.service \
 	tests/services/org.freedesktop.portal.Documents.service \
 	$(NULL)
diff --git a/tests/xdg-app-valgrind.supp b/tests/flatpak-valgrind.supp
index 00efd87..00efd87 100644
--- a/tests/xdg-app-valgrind.supp
+++ b/tests/flatpak-valgrind.supp
diff --git a/tests/libtest.sh b/tests/libtest.sh
index 63800ff..3867d9e 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -62,20 +62,20 @@ if test -n "${OT_TESTS_DEBUG:-}"; then
 fi
 
 if test -n "${OT_TESTS_VALGRIND:-}"; then
-    CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/xdg-app-valgrind.supp"
+    CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/flatpak-valgrind.supp"
 else
     CMD_PREFIX=""
 fi
 
 # We need this to be in /var/tmp because /tmp has no xattr support
-TEST_DATA_DIR=`mktemp -d /var/tmp/test-xdg-app-XXXXXX`
+TEST_DATA_DIR=`mktemp -d /var/tmp/test-flatpak-XXXXXX`
 
 export XDG_DATA_HOME=${TEST_DATA_DIR}/share
 
 export USERDIR=${TEST_DATA_DIR}/share/xdg-app
-export ARCH=`xdg-app --default-arch`
+export ARCH=`flatpak --default-arch`
 
-export XDG_APP="${CMD_PREFIX} xdg-app"
+export FLATPAK="${CMD_PREFIX} flatpak"
 
 assert_streq () {
     test "$1" = "$2" || (echo 1>&2 "$1 != $2"; exit 1)
@@ -146,7 +146,7 @@ assert_file_empty() {
 setup_repo () {
     . $(dirname $0)/make-test-runtime.sh org.test.Platform bash ls cat echo readlink > /dev/null
     . $(dirname $0)/make-test-app.sh > /dev/null
-    xdg-app remote-add --user --no-gpg-verify test-repo repo
+    flatpak remote-add --user --no-gpg-verify test-repo repo
 }
 
 setup_sdk_repo () {
@@ -155,21 +155,21 @@ setup_sdk_repo () {
 
 
 install_repo () {
-    ${XDG_APP} --user install test-repo org.test.Platform master
-    ${XDG_APP} --user install test-repo org.test.Hello master
+    ${FLATPAK} --user install test-repo org.test.Platform master
+    ${FLATPAK} --user install test-repo org.test.Hello master
 }
 
 install_sdk_repo () {
-    ${XDG_APP} --user install test-repo org.test.Sdk master
+    ${FLATPAK} --user install test-repo org.test.Sdk master
 }
 
 run () {
-    ${CMD_PREFIX} xdg-app run "$@"
+    ${CMD_PREFIX} flatpak run "$@"
 
 }
 
 run_sh () {
-    ${CMD_PREFIX} xdg-app run --command=bash ${ARGS-} org.test.Hello -c "$*"
+    ${CMD_PREFIX} flatpak run --command=bash ${ARGS-} org.test.Hello -c "$*"
 }
 
 sed s#@testdir@#${test_builddir}# ${test_srcdir}/session.conf.in > session.conf
diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
index 20683e4..e0f927e 100755
--- a/tests/make-test-app.sh
+++ b/tests/make-test-app.sh
@@ -5,7 +5,7 @@ set -e
 DIR=`mktemp -d`
 
 # Init dir
-xdg-app build-init ${DIR} org.test.Hello org.test.Platform org.test.Platform
+flatpak build-init ${DIR} org.test.Hello org.test.Platform org.test.Platform
 
 mkdir -p ${DIR}/files/bin
 cat > ${DIR}/files/bin/hello.sh <<EOF
@@ -29,7 +29,7 @@ cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/hicolor/64x64/apps/
 
 
 mkdir -p ${DIR}/files/share/app-info/xmls
-mkdir -p ${DIR}/files/share/app-info/icons/xdg-app/64x64
+mkdir -p ${DIR}/files/share/app-info/icons/flatpak/64x64
 gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <components version="0.8">
@@ -45,8 +45,8 @@ gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF
   </component>
 </components>
 EOF
-cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/xdg-app/64x64/
+cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/flatpak/64x64/
 
-xdg-app build-finish --command=hello.sh ${DIR}
-xdg-app build-export repo ${DIR}
+flatpak build-finish --command=hello.sh ${DIR}
+flatpak build-export repo ${DIR}
 rm -rf ${DIR}
diff --git a/tests/make-test-bundles.sh b/tests/make-test-bundles.sh
index 3bdc5ce..ea135e9 100755
--- a/tests/make-test-bundles.sh
+++ b/tests/make-test-bundles.sh
@@ -9,18 +9,18 @@ URL=file://`pwd`/repo
 
 REF=`(cd repo/refs/heads; echo app/org.test.Hello/*/master)`
 
-xdg-app build-bundle repo hello.xdgapp org.test.Hello
-xdg-app build-bundle repo hello-key.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello
-xdg-app build-bundle repo --repo-url=${URL} hello-origin.xdgapp org.test.Hello
-xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin.xdgapp org.test.Hello
+flatpak build-bundle repo hello.pak org.test.Hello
+flatpak build-bundle repo hello-key.pak --gpg-keys=test-keyring/pubring.gpg org.test.Hello
+flatpak build-bundle repo --repo-url=${URL} hello-origin.pak org.test.Hello
+flatpak build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin.pak org.test.Hello
 
 ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
 
-xdg-app build-bundle repo hello-signed.xdgapp org.test.Hello
-xdg-app build-bundle repo hello-key-signed.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello
-xdg-app build-bundle repo --repo-url=${URL} hello-origin-signed.xdgapp org.test.Hello
-xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin-signed.xdgapp org.test.Hello
+flatpak build-bundle repo hello-signed.pak org.test.Hello
+flatpak build-bundle repo hello-key-signed.pak --gpg-keys=test-keyring/pubring.gpg org.test.Hello
+flatpak build-bundle repo --repo-url=${URL} hello-origin-signed.pak org.test.Hello
+flatpak build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin-signed.pak org.test.Hello
 
 REF=`(cd repo/refs/heads; echo runtime/org.test.Platform/*/master)`
 ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
-xdg-app build-bundle --runtime repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg platform.xdgapp org.test.Platform
+flatpak build-bundle --runtime repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg platform.pak org.test.Platform
diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
index 631af63..15896f6 100755
--- a/tests/make-test-runtime.sh
+++ b/tests/make-test-runtime.sh
@@ -7,7 +7,7 @@ DIR=`mktemp -d`
 ID=$1
 shift
 
-xdg-app build-init ${DIR} ${ID} ${ID} ${ID}
+flatpak build-init ${DIR} ${ID} ${ID} ${ID}
 sed -i s/Application/Runtime/ ${DIR}/metadata
 
 # Add bash and dependencies
@@ -26,5 +26,5 @@ for i in `sort -u $T`; do
     cp "$i" ${DIR}/usr/lib/
 done
 
-xdg-app build-export --runtime repo ${DIR}
+flatpak build-export --runtime repo ${DIR}
 rm -rf ${DIR}
diff --git a/tests/test-basic.sh b/tests/test-basic.sh
index fc88a12..e074828 100755
--- a/tests/test-basic.sh
+++ b/tests/test-basic.sh
@@ -23,19 +23,19 @@ set -euo pipefail
 
 echo "1..3"
 
-${XDG_APP} --version > version_out
+${FLATPAK} --version > version_out
 
 VERSION=`cat $(dirname $0)/package_version.txt`
 assert_file_has_content version_out "^flatpak $VERSION$"
 
 echo "ok version"
 
-${XDG_APP} --help > help_out
+${FLATPAK} --help > help_out
 
 assert_file_has_content help_out "^Usage:$"
 
 echo "ok help"
 
-${XDG_APP} --default-arch > /dev/null
+${FLATPAK} --default-arch > /dev/null
 
 echo "ok default arch"
diff --git a/tests/test-builder.sh b/tests/test-builder.sh
index 1ac4758..dcbe586 100755
--- a/tests/test-builder.sh
+++ b/tests/test-builder.sh
@@ -35,7 +35,7 @@ cd $TEST_DATA_DIR/
 cp -a $(dirname $0)/test-configure .
 echo "version1" > app-data
 cp $(dirname $0)/test.json .
-xdg-app-builder --repo=$REPO --force-clean appdir test.json > /dev/null
+flatpak-builder --repo=$REPO --force-clean appdir test.json > /dev/null
 
 assert_file_has_content appdir/files/share/app-data version1
 assert_file_has_content appdir/metadata shared=network;
@@ -46,12 +46,12 @@ assert_not_has_file appdir/files/bin/file.cleanup
 
 assert_has_file appdir/files/cleaned_up > out
 
-${XDG_APP} build appdir /app/bin/hello2.sh > hello_out2
+${FLATPAK} build appdir /app/bin/hello2.sh > hello_out2
 assert_file_has_content hello_out2 '^Hello world2, from a sandbox$'
 
 echo "ok build"
 
-${XDG_APP} --user install test-repo org.test.Hello2 master
+${FLATPAK} --user install test-repo org.test.Hello2 master
 run org.test.Hello2 > hello_out3
 assert_file_has_content hello_out3 '^Hello world2, from a sandbox$'
 
@@ -61,10 +61,10 @@ assert_file_has_content app_data_1 version1
 echo "ok install+run"
 
 echo "version2" > app-data
-xdg-app-builder --repo=$REPO --force-clean appdir test.json > /dev/null
+flatpak-builder --repo=$REPO --force-clean appdir test.json > /dev/null
 assert_file_has_content appdir/files/share/app-data version2
 
-${XDG_APP} --user update org.test.Hello2 master
+${FLATPAK} --user update org.test.Hello2 master
 
 run --command=cat org.test.Hello2 /app/share/app-data > app_data_2
 assert_file_has_content app_data_2 version2
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 493b844..c10912a 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -40,7 +40,7 @@ assert_has_dir $USERDIR/app/org.test.Hello/$ARCH/master/active/files
 assert_has_dir $USERDIR/app/org.test.Hello/$ARCH/master/active/export
 assert_has_file $USERDIR/exports/share/applications/org.test.Hello.desktop
 # Ensure Exec key is rewritten
-assert_file_has_content $USERDIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/xdg-app run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
+assert_file_has_content $USERDIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
 assert_has_file $USERDIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
 
 # Ensure triggers ran
@@ -49,14 +49,14 @@ assert_file_has_content $USERDIR/exports/share/applications/mimeinfo.cache x-tes
 assert_has_file $USERDIR/exports/share/icons/hicolor/icon-theme.cache
 assert_has_file $USERDIR/exports/share/icons/hicolor/index.theme
 
-$XDG_APP list --user | grep org.test.Hello > /dev/null
-$XDG_APP list --user -d | grep org.test.Hello | grep test-repo > /dev/null
-$XDG_APP list --user -d | grep org.test.Hello | grep current > /dev/null
-$XDG_APP list --user -d | grep org.test.Hello | grep ${ID:0:12} > /dev/null
+$FLATPAK list --user | grep org.test.Hello > /dev/null
+$FLATPAK list --user -d | grep org.test.Hello | grep test-repo > /dev/null
+$FLATPAK list --user -d | grep org.test.Hello | grep current > /dev/null
+$FLATPAK list --user -d | grep org.test.Hello | grep ${ID:0:12} > /dev/null
 
-$XDG_APP info --user org.test.Hello > /dev/null
-$XDG_APP info --user org.test.Hello | grep test-repo > /dev/null
-$XDG_APP info --user org.test.Hello | grep $ID > /dev/null
+$FLATPAK info --user org.test.Hello > /dev/null
+$FLATPAK info --user org.test.Hello | grep test-repo > /dev/null
+$FLATPAK info --user org.test.Hello | grep $ID > /dev/null
 
 echo "ok install"
 
@@ -65,10 +65,10 @@ assert_file_has_content hello_out '^Hello world, from a sandbox$'
 
 echo "ok hello"
 
-run_sh cat /run/user/`id -u`/xdg-app-info > xai
-assert_file_has_content xai '^name=org.test.Hello$'
+run_sh cat /run/user/`id -u`/flatpak-info > fpi
+assert_file_has_content fpi '^name=org.test.Hello$'
 
-echo "ok xdg-app-info"
+echo "ok flatpak-info"
 
 run_sh readlink /proc/self/ns/net > unshared_net_ns
 ARGS="--share=network" run_sh readlink /proc/self/ns/net > shared_net_ns
@@ -89,12 +89,12 @@ ARGS="--filesystem=host" run_sh cat $(dirname $0)/package_version.txt > /dev/nul
 
 echo "ok namespaces"
 
-$XDG_APP override --user --filesystem=host org.test.Hello
+$FLATPAK override --user --filesystem=host org.test.Hello
 run_sh cat $(dirname $0)/package_version.txt &> /dev/null
 if ARGS="--nofilesystem=host" run_sh cat $(dirname $0)/package_version.txt &> /dev/null; then
     assert_not_reached "Unexpectedly allowed to access --nofilesystem=host file"
 fi
-$XDG_APP override --user --nofilesystem=host org.test.Hello
+$FLATPAK override --user --nofilesystem=host org.test.Hello
 
 if run_sh cat $(dirname $0)/package_version.txt &> /dev/null; then
     assert_not_reached "Unexpectedly allowed to access file"
diff --git a/tests/xdg-app.supp b/tests/xdg-app.supp
deleted file mode 100644
index 05722a9..0000000
--- a/tests/xdg-app.supp
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-   glib _dl_init
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:_dl_init
-}
-
-{
-   glib _static_types
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:g_type_register_static
-}
-
-{
-   glib _static_typ
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:type_class_init_Wm
-}
-
-{
-   gio dbus worker thread
-   Memcheck:Leak
-   fun:calloc
-   ...
-   fun:_g_dbus_worker_new
-}