Ubuntu Application Launcher

libubuntu-app-launch/application-info-desktop.cpp (+62/-29)
libubuntu-app-launch/application-info-desktop.h (+1/-1)
tests/CMakeLists.txt (+1/-0)
tests/application-info-desktop.cpp (+147/-91)

To merge this branch:

bzr merge lp:~ted/ubuntu-app-launch/relax-icon-rules

High

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Marcus Tomlinson (community)		2016-09-14	Approve on 2016-09-30
unity-api-1-bot	continuous-integration		Approve on 2016-09-30
Review via email: mp+305736@code.launchpad.net

Commit message

Don't throw an exception when a Desktop file fails to include an Icon key

Description of the change

This branch changes the handling of the Icon key in desktop files but has two cleanups as well.

It changes the desktop helper functions to have a normal and a "Required" version to try and make the differences more clear on whether it'll throw an exception or not.

It does automatic code formatting on the application-info-desktop test.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-14:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/97/rebuild

review: Approve (continuous-integration)

Revision history for this message

Marcus Tomlinson (marcustomlinson) wrote on 2016-09-30:

Again, outstanding commitment to testing.

Diff looks alright, but I'm getting a 404 when trying to download the build artefacts, so I've hit rebuild. Will come back to test in a bit.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-30:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/108/rebuild

review: Approve (continuous-integration)

Revision history for this message

Marcus Tomlinson (marcustomlinson) wrote on 2016-09-30:

Cool, confirmed this fixes the bug. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Indicator Applet Developers

Ted Gould

 === modified file 'libubuntu-app-launch/application-info-desktop.cpp'
 --- libubuntu-app-launch/application-info-desktop.cpp	2016-09-14 16:48:27 +0000
 +++ libubuntu-app-launch/application-info-desktop.cpp	2016-09-14 16:48:28 +0000
@@ -43,8 +43,9 @@
  }  // anonymous namespace
  template <typename T>
--auto stringFromKeyfile(std::shared_ptr<GKeyFile> keyfile, const std::string& key, const std::string& exceptionText = {})
--    -> T
++auto stringFromKeyfileRequired(const std::shared_ptr<GKeyFile>& keyfile,
++                               const std::string& key,
++                               const std::string& exceptionText) -> T
+ {
      GError* error = nullptr;
      auto keyval = g_key_file_get_locale_string(keyfile.get(), DESKTOP_GROUP, key.c_str(), nullptr, &error);
@@ -66,11 +67,17 @@
+ }
  template <typename T>
--auto fileFromKeyfile(std::shared_ptr<GKeyFile> keyfile,
--                     const std::string& basePath,
--                     const std::string& rootDir,
--                     const std::string& key,
--                     const std::string& exceptionText = {}) -> T
++auto stringFromKeyfile(const std::shared_ptr<GKeyFile>& keyfile, const std::string& key) -> T
++{
++    return stringFromKeyfileRequired<T>(keyfile, key, {});
++}
++
++template <typename T>
++auto fileFromKeyfileRequired(const std::shared_ptr<GKeyFile>& keyfile,
++                             const std::string& basePath,
++                             const std::string& rootDir,
++                             const std::string& key,
++                             const std::string& exceptionText) -> T
+ {
      GError* error = nullptr;
      auto keyval = g_key_file_get_locale_string(keyfile.get(), DESKTOP_GROUP, key.c_str(), nullptr, &error);
@@ -113,10 +120,18 @@
+ }
  template <typename T>
--auto boolFromKeyfile(std::shared_ptr<GKeyFile> keyfile,
--                     const std::string& key,
--                     bool defaultReturn,
--                     const std::string& exceptionText = {}) -> T
++auto fileFromKeyfile(const std::shared_ptr<GKeyFile>& keyfile,
++                     const std::string& basePath,
++                     const std::string& rootDir,
++                     const std::string& key) -> T
++{
++    return fileFromKeyfileRequired<T>(keyfile, basePath, rootDir, key, {});
++}
++
++template <typename T>
++auto boolFromKeyfileRequired(const std::shared_ptr<GKeyFile>& keyfile,
++                             const std::string& key,
++                             const std::string& exceptionText) -> T
+ {
      GError* error = nullptr;
      auto keyval = g_key_file_get_boolean(keyfile.get(), DESKTOP_GROUP, key.c_str(), &error);
@@ -124,21 +139,30 @@
      if (error != nullptr)
+     {
          auto perror = std::shared_ptr<GError>(error, g_error_free);
--        if (!exceptionText.empty())
--        {
--            throw std::runtime_error(exceptionText + perror.get()->message);
--        }
--
++        throw std::runtime_error(exceptionText + perror.get()->message);
++    }
++
++    T retval = T::from_raw(keyval == TRUE);
++    return retval;
++}
++
++template <typename T>
++auto boolFromKeyfile(const std::shared_ptr<GKeyFile>& keyfile, const std::string& key, bool defaultReturn) -> T
++{
++    try
++    {
++        return boolFromKeyfileRequired<T>(keyfile, key, "Boolean value not available, but not required");
++    }
++    catch (std::runtime_error& e)
++    {
          return T::from_raw(defaultReturn);
+     }
--
--    T retval = T::from_raw(keyval == TRUE);
--    return retval;
+ }
  template <typename T>
--auto stringlistFromKeyfile(std::shared_ptr<GKeyFile> keyfile, const gchar* key, const std::string& exceptionText = {})
--    -> T
++auto stringlistFromKeyfileRequired(const std::shared_ptr<GKeyFile>& keyfile,
++                                   const gchar* key,
++                                   const std::string& exceptionText) -> T
+ {
      GError* error = nullptr;
      auto keyval = g_key_file_get_locale_string_list(keyfile.get(), DESKTOP_GROUP, key, nullptr, nullptr, &error);
@@ -167,7 +191,13 @@
      return T::from_raw(results);
+ }
--bool stringlistFromKeyfileContains(std::shared_ptr<GKeyFile> keyfile,
++template <typename T>
++auto stringlistFromKeyfile(const std::shared_ptr<GKeyFile>& keyfile, const gchar* key) -> T
++{
++    return stringlistFromKeyfileRequired<T>(keyfile, key, {});
++}
++
++bool stringlistFromKeyfileContains(const std::shared_ptr<GKeyFile>& keyfile,
                                     const gchar* key,
                                     const std::string& match,
                                     bool defaultValue)
@@ -194,7 +224,7 @@
      return result;
+ }
--Desktop::Desktop(std::shared_ptr<GKeyFile> keyfile,
++Desktop::Desktop(const std::shared_ptr<GKeyFile>& keyfile,
                   const std::string& basePath,
                   const std::string& rootDir,
                   std::bitset<2> flags,
@@ -233,17 +263,20 @@
      }())
      , _basePath(basePath)
      , _rootDir(rootDir)
--    , _name(stringFromKeyfile<Application::Info::Name>(keyfile, "Name", "Unable to get name from keyfile"))
++    , _name(stringFromKeyfileRequired<Application::Info::Name>(keyfile, "Name", "Unable to get name from keyfile"))
      , _description(stringFromKeyfile<Application::Info::Description>(keyfile, "Comment"))
      , _iconPath([keyfile, basePath, rootDir, registry]() {
          if (registry != nullptr)
+         {
--            auto iconName =
--                stringFromKeyfile<Application::Info::IconPath>(keyfile, "Icon", "Missing icon for desktop file");
--            return registry->impl->getIconFinder(basePath)->find(iconName);
++            auto iconName = stringFromKeyfile<Application::Info::IconPath>(keyfile, "Icon");
++
++            if (!iconName.value().empty() && iconName.value()[0] != '/')
++            {
++                /* If it is not a direct filename look it up */
++                return registry->impl->getIconFinder(basePath)->find(iconName);
++            }
+         }
--        return fileFromKeyfile<Application::Info::IconPath>(keyfile, basePath, rootDir, "Icon",
--                                                            "Missing icon for desktop file");
++        return fileFromKeyfile<Application::Info::IconPath>(keyfile, basePath, rootDir, "Icon");
      }())
      , _defaultDepartment(
            stringFromKeyfile<Application::Info::DefaultDepartment>(keyfile, "X-Ubuntu-Default-Department-ID"))
 === modified file 'libubuntu-app-launch/application-info-desktop.h'
 --- libubuntu-app-launch/application-info-desktop.h	2016-09-14 16:48:27 +0000
 +++ libubuntu-app-launch/application-info-desktop.h	2016-09-14 16:48:28 +0000
@@ -41,7 +41,7 @@
  class Desktop : public Application::Info
+ {
  public:
--    Desktop(std::shared_ptr<GKeyFile> keyfile,
++    Desktop(const std::shared_ptr<GKeyFile>& keyfile,
              const std::string& basePath,
              const std::string& rootDir,
              std::bitset<2> flags,
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2016-09-14 16:48:27 +0000
 +++ tests/CMakeLists.txt	2016-09-14 16:48:28 +0000
@@ -157,6 +157,7 @@
  add_custom_target(format-tests
  	COMMAND clang-format -i -style=file
++	application-info-desktop.cpp
  	libual-cpp-test.cc
  	list-apps.cpp
  	eventually-fixture.h
 === modified file 'tests/application-info-desktop.cpp'
 --- tests/application-info-desktop.cpp	2016-09-14 16:48:27 +0000
 +++ tests/application-info-desktop.cpp	2016-09-14 16:48:28 +0000
@@ -19,8 +19,8 @@
  #include "application-info-desktop.h"
++#include <cstdlib>
  #include <gtest/gtest.h>
--#include <cstdlib>
  namespace
+ {
@@ -30,7 +30,7 @@
+ {
  protected:
      ApplicationInfoDesktop()
--      : test_dekstop_env("SomeFreeDesktop")
++        : test_dekstop_env("SomeFreeDesktop")
+     {
+     }
@@ -56,10 +56,10 @@
      const std::string test_dekstop_env;
  };
--
  TEST_F(ApplicationInfoDesktop, DefaultState)
+ {
--    auto appinfo = ubuntu::app_launch::app_info::Desktop(defaultKeyfile(), "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr);
++    auto appinfo = ubuntu::app_launch::app_info::Desktop(defaultKeyfile(), "/", {},
++                                                         ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr);
      EXPECT_EQ("Foo App", appinfo.name().value());
      EXPECT_EQ("", appinfo.description().value());
@@ -71,7 +71,7 @@
      EXPECT_EQ("", appinfo.splash().backgroundColor.value());
      EXPECT_EQ("", appinfo.splash().headerColor.value());
      EXPECT_EQ("", appinfo.splash().footerColor.value());
--    EXPECT_FALSE( appinfo.splash().showHeader.value());
++    EXPECT_FALSE(appinfo.splash().showHeader.value());
      EXPECT_TRUE(appinfo.supportedOrientations().portrait);
      EXPECT_TRUE(appinfo.supportedOrientations().landscape);
@@ -86,35 +86,41 @@
  TEST_F(ApplicationInfoDesktop, KeyfileErrors)
+ {
      // empty
--    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop({}, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr), std::runtime_error);
++    EXPECT_THROW(
++        ubuntu::app_launch::app_info::Desktop({}, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr),
++        std::runtime_error);
      // empty name
      auto noname = defaultKeyfile();
      g_key_file_remove_key(noname.get(), DESKTOP, "Name", nullptr);
--    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(noname, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr), std::runtime_error);
--
--    // empty icon
--    auto noicon = defaultKeyfile();
--    g_key_file_remove_key(noicon.get(), DESKTOP, "Icon", nullptr);
--    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(noicon, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr), std::runtime_error);
++    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(noname, "/", {},
++                                                       ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr),
++                 std::runtime_error);
      // wrong type
      auto wrongtype = defaultKeyfile();
      g_key_file_set_string(wrongtype.get(), DESKTOP, "Type", "MimeType");
--    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(wrongtype, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr), std::runtime_error);
++    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(wrongtype, "/", {},
++                                                       ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr),
++                 std::runtime_error);
      // not displayable
      auto nodisplay = defaultKeyfile();
      g_key_file_set_boolean(nodisplay.get(), DESKTOP, "NoDisplay", TRUE);
--    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(nodisplay, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr), std::runtime_error);
--    EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(nodisplay, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::ALLOW_NO_DISPLAY, nullptr));
++    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(nodisplay, "/", {},
++                                                       ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr),
++                 std::runtime_error);
++    EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(
++        nodisplay, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::ALLOW_NO_DISPLAY, nullptr));
      // hidden
      auto hidden = defaultKeyfile();
      g_key_file_set_string(hidden.get(), DESKTOP, "Hidden", "true");
--    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(hidden, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr), std::runtime_error);
++    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(hidden, "/", {},
++                                                       ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr),
++                 std::runtime_error);
--    /* Disabling for OTA11 */
++/* Disabling for OTA11 */
  #if 0
      // not shown in Unity
      auto notshowin = defaultKeyfile();
@@ -134,12 +140,14 @@
      std::string datadir = "/foo/usr/share";
      std::string basedir = "/foo";
--    auto defappinfo = ubuntu::app_launch::app_info::Desktop(defkeyfile, datadir, basedir, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr);
++    auto defappinfo = ubuntu::app_launch::app_info::Desktop(defkeyfile, datadir, basedir,
++                                                            ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr);
      EXPECT_EQ("/foo/usr/share/foo.png", defappinfo.iconPath().value());
      auto rootkeyfile = defaultKeyfile();
      g_key_file_set_string(rootkeyfile.get(), DESKTOP, "Icon", "/bar/foo.png");
--    auto rootappinfo = ubuntu::app_launch::app_info::Desktop(rootkeyfile, datadir, basedir, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr);
++    auto rootappinfo = ubuntu::app_launch::app_info::Desktop(rootkeyfile, datadir, basedir,
++                                                             ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr);
      EXPECT_EQ("/foo/bar/foo.png", rootappinfo.iconPath().value());
+ }
@@ -147,125 +155,173 @@
+ {
      auto keyfile = defaultKeyfile();
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Default-Department-ID", "foo");
--    EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr));
++    EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(keyfile, "/", {},
++                                                          ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr));
+ }
  TEST_F(ApplicationInfoDesktop, KeyfileScreenshotPath)
+ {
      auto keyfile = defaultKeyfile();
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Screenshot", "foo.png");
--    EXPECT_EQ("/foo.png", ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).screenshotPath().value());
++    EXPECT_EQ("/foo.png", ubuntu::app_launch::app_info::Desktop(
++                              keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                              .screenshotPath()
++                              .value());
+ }
  TEST_F(ApplicationInfoDesktop, KeyfileKeywords)
+ {
--    std::vector<std::string>expectedKeywords{"foo", "bar", "baz"};
++    std::vector<std::string> expectedKeywords{"foo", "bar", "baz"};
      auto keyfile = defaultKeyfile();
      g_key_file_set_string(keyfile.get(), DESKTOP, "Keywords", "foo;bar;baz;");
--    EXPECT_EQ(expectedKeywords, ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).keywords().value());
++    EXPECT_EQ(expectedKeywords, ubuntu::app_launch::app_info::Desktop(
++                                    keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                                    .keywords()
++                                    .value());
+ }
  TEST_F(ApplicationInfoDesktop, KeyfileShowListEdgeCases)
+ {
--  // Not appearing in not show list
--  auto notshowin = defaultKeyfile();
--  g_key_file_set_string(notshowin.get(), DESKTOP, "NotShowIn", "Gnome;KDE;");
--  EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(notshowin, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr));
--
--  // Appearing explicitly in only show list
--  auto onlyshowin = defaultKeyfile();
--  g_key_file_set_string(onlyshowin.get(), DESKTOP, "OnlyShowIn", (test_dekstop_env + ";Gnome;").c_str());
--  EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(onlyshowin, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr));
--
--  // Appearing explicitly in only show list not first
--  auto onlyshowinmiddle = defaultKeyfile();
--  g_key_file_set_string(onlyshowinmiddle.get(), DESKTOP, "OnlyShowIn", ("Gnome;" + test_dekstop_env + ";KDE;").c_str());
--  EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(onlyshowinmiddle, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr));
++    // Not appearing in not show list
++    auto notshowin = defaultKeyfile();
++    g_key_file_set_string(notshowin.get(), DESKTOP, "NotShowIn", "Gnome;KDE;");
++    EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(notshowin, "/", {},
++                                                          ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr));
++
++    // Appearing explicitly in only show list
++    auto onlyshowin = defaultKeyfile();
++    g_key_file_set_string(onlyshowin.get(), DESKTOP, "OnlyShowIn", (test_dekstop_env + ";Gnome;").c_str());
++    EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(onlyshowin, "/", {},
++                                                          ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr));
++
++    // Appearing explicitly in only show list not first
++    auto onlyshowinmiddle = defaultKeyfile();
++    g_key_file_set_string(onlyshowinmiddle.get(), DESKTOP, "OnlyShowIn",
++                          ("Gnome;" + test_dekstop_env + ";KDE;").c_str());
++    EXPECT_NO_THROW(ubuntu::app_launch::app_info::Desktop(onlyshowinmiddle, "/", {},
++                                                          ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr));
+ }
  TEST_F(ApplicationInfoDesktop, Orientations)
+ {
      ubuntu::app_launch::Application::Info::Orientations defaultOrientations =
--    {
--portrait:
--        true,
--landscape:
--        true,
--invertedPortrait:
--        true,
--invertedLandscape:
--        true
--    };
++        {portrait : true, landscape : true, invertedPortrait : true, invertedLandscape : true};
      auto keyfile = defaultKeyfile();
--    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(
++                                       keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                                       .supportedOrientations());
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "this should not parse");
--    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(
++                                       keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                                       .supportedOrientations());
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "this;should;not;parse;");
--    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(
++                                       keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                                       .supportedOrientations());
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "portrait;");
--    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: false, invertedPortrait: false, invertedLandscape: false}),
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ((ubuntu::app_launch::Application::Info::
++               Orientations{portrait : true, landscape : false, invertedPortrait : false, invertedLandscape : false}),
++              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE,
++                                                    nullptr)
++                  .supportedOrientations());
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "landscape;portrait;");
--    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: false, invertedLandscape: false}),
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ((ubuntu::app_launch::Application::Info::
++               Orientations{portrait : true, landscape : true, invertedPortrait : false, invertedLandscape : false}),
++              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE,
++                                                    nullptr)
++                  .supportedOrientations());
--    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "landscape  ;  portrait;    invertedPortrait");
--    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: true, invertedLandscape: false}),
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations",
++                          "landscape  ;  portrait;    invertedPortrait");
++    EXPECT_EQ((ubuntu::app_launch::Application::Info::
++               Orientations{portrait : true, landscape : true, invertedPortrait : true, invertedLandscape : false}),
++              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE,
++                                                    nullptr)
++                  .supportedOrientations());
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "portrait;landscape;");
--    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: false, invertedLandscape: false}),
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ((ubuntu::app_launch::Application::Info::
++               Orientations{portrait : true, landscape : true, invertedPortrait : false, invertedLandscape : false}),
++              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE,
++                                                    nullptr)
++                  .supportedOrientations());
--    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "portrait;landscape;invertedportrait;invertedlandscape;");
--    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: true, invertedLandscape: true}),
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations",
++                          "portrait;landscape;invertedportrait;invertedlandscape;");
++    EXPECT_EQ((ubuntu::app_launch::Application::Info::
++               Orientations{portrait : true, landscape : true, invertedPortrait : true, invertedLandscape : true}),
++              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE,
++                                                    nullptr)
++                  .supportedOrientations());
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "PORTRAIT;");
--    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: false, invertedPortrait: false, invertedLandscape: false}),
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ((ubuntu::app_launch::Application::Info::
++               Orientations{portrait : true, landscape : false, invertedPortrait : false, invertedLandscape : false}),
++              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE,
++                                                    nullptr)
++                  .supportedOrientations());
--    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "pOrTraIt;lANDscApE;inVErtEDpORtrAit;iNVErtEDLAnDsCapE;");
--    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: true, invertedLandscape: true}),
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations",
++                          "pOrTraIt;lANDscApE;inVErtEDpORtrAit;iNVErtEDLAnDsCapE;");
++    EXPECT_EQ((ubuntu::app_launch::Application::Info::
++               Orientations{portrait : true, landscape : true, invertedPortrait : true, invertedLandscape : true}),
++              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE,
++                                                    nullptr)
++                  .supportedOrientations());
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "primary;");
--    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: false, landscape: false, invertedPortrait: false, invertedLandscape: false}),
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ((ubuntu::app_launch::Application::Info::
++               Orientations{portrait : false, landscape : false, invertedPortrait : false, invertedLandscape : false}),
++              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE,
++                                                    nullptr)
++                  .supportedOrientations());
      g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "foobar;primary;");
--    EXPECT_EQ(defaultOrientations,
--              ubuntu::app_launch::app_info::Desktop(keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).supportedOrientations());
++    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(
++                                       keyfile, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                                       .supportedOrientations());
+ }
  TEST_F(ApplicationInfoDesktop, XMirCases)
+ {
--  auto xmirunset = defaultKeyfile();
--  EXPECT_FALSE(
--              ubuntu::app_launch::app_info::Desktop(xmirunset, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).xMirEnable().value());
--  EXPECT_TRUE(
--              ubuntu::app_launch::app_info::Desktop(xmirunset, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::XMIR_DEFAULT, nullptr).xMirEnable().value());
--
--  auto xmirtrue = defaultKeyfile();
--  g_key_file_set_boolean(xmirtrue.get(), DESKTOP, "X-Ubuntu-XMir-Enable", TRUE);
--  EXPECT_TRUE(
--              ubuntu::app_launch::app_info::Desktop(xmirtrue, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).xMirEnable().value());
--  EXPECT_TRUE(
--              ubuntu::app_launch::app_info::Desktop(xmirtrue, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::XMIR_DEFAULT, nullptr).xMirEnable().value());
--
--  auto xmirfalse = defaultKeyfile();
--  g_key_file_set_boolean(xmirfalse.get(), DESKTOP, "X-Ubuntu-XMir-Enable", FALSE);
--  EXPECT_FALSE(
--              ubuntu::app_launch::app_info::Desktop(xmirfalse, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr).xMirEnable().value());
--  EXPECT_FALSE(
--              ubuntu::app_launch::app_info::Desktop(xmirfalse, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::XMIR_DEFAULT, nullptr).xMirEnable().value());
++    auto xmirunset = defaultKeyfile();
++    EXPECT_FALSE(ubuntu::app_launch::app_info::Desktop(xmirunset, "/", {},
++                                                       ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                     .xMirEnable()
++                     .value());
++    EXPECT_TRUE(ubuntu::app_launch::app_info::Desktop(xmirunset, "/", {},
++                                                      ubuntu::app_launch::app_info::DesktopFlags::XMIR_DEFAULT, nullptr)
++                    .xMirEnable()
++                    .value());
++
++    auto xmirtrue = defaultKeyfile();
++    g_key_file_set_boolean(xmirtrue.get(), DESKTOP, "X-Ubuntu-XMir-Enable", TRUE);
++    EXPECT_TRUE(ubuntu::app_launch::app_info::Desktop(xmirtrue, "/", {},
++                                                      ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                    .xMirEnable()
++                    .value());
++    EXPECT_TRUE(ubuntu::app_launch::app_info::Desktop(xmirtrue, "/", {},
++                                                      ubuntu::app_launch::app_info::DesktopFlags::XMIR_DEFAULT, nullptr)
++                    .xMirEnable()
++                    .value());
++
++    auto xmirfalse = defaultKeyfile();
++    g_key_file_set_boolean(xmirfalse.get(), DESKTOP, "X-Ubuntu-XMir-Enable", FALSE);
++    EXPECT_FALSE(ubuntu::app_launch::app_info::Desktop(xmirfalse, "/", {},
++                                                       ubuntu::app_launch::app_info::DesktopFlags::NONE, nullptr)
++                     .xMirEnable()
++                     .value());
++    EXPECT_FALSE(ubuntu::app_launch::app_info::Desktop(
++                     xmirfalse, "/", {}, ubuntu::app_launch::app_info::DesktopFlags::XMIR_DEFAULT, nullptr)
++                     .xMirEnable()
++                     .value());
+ }
--} //anonymous namespace
++}  // anonymous namespace