Merge lp:~mardy/ubuntu-system-settings-online-accounts/app-from-profile into lp:~mardy/ubuntu-system-settings-online-accounts/master

[Alberto Mardegan]

Add ApplicationManager::applicationFromProfile()

Add ApplicationManager::applicationFromProfile()

[Justin McPherson (justinmcp)]

review: Approve

=== modified file 'src/application-manager.cpp'
--- src/application-manager.cpp	2014-05-14 13:31:42 +0000
+++ src/application-manager.cpp	2014-06-06 07:21:21 +0000
@@ -22,7 +22,6 @@
 #include "application-manager.h"
 #include "debug.h"
 
-#include <Accounts/Application>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QFile>
@@ -134,11 +133,9 @@
     QString applicationId = claimedAppId;
     Accounts::Application application =
         AccountManager::instance()->application(applicationId);
-    if (!application.isValid() && profile.startsWith(applicationId)) {
-        /* Handle the case where in the future we might decide to use the full
-         * profile (including the version number) as application id. */
-        applicationId = profile;
-        application = AccountManager::instance()->application(applicationId);
+    if (!application.isValid()) {
+        application = applicationFromProfile(profile);
+        applicationId = application.name();
     }
 
     /* Make sure that the app is who it claims to be */
@@ -217,3 +214,25 @@
     }
     return newAcl;
 }
+
+Accounts::Application
+ApplicationManager::applicationFromProfile(const QString &profile)
+{
+    /* If the profile is not a click package profile, we have no way of knowing
+     * what application it is. */
+    QStringList components = profile.split('_');
+    if (components.count() != 3) return Accounts::Application();
+
+    /* First try to see if we can use the full profile as app ID; if not, strip
+     * out the version, and if that fails as well then use only the package
+     * name. */
+    AccountManager *manager = AccountManager::instance();
+    Accounts::Application application = manager->application(profile);
+    if (application.isValid()) return application;
+
+    QString applicationId = components[0] + "_" + components[1];
+    application = manager->application(applicationId);
+    if (application.isValid()) return application;
+
+    return manager->application(components[0]);
+}

=== modified file 'src/application-manager.h'
--- src/application-manager.h	2014-05-14 13:31:42 +0000
+++ src/application-manager.h	2014-06-06 07:21:21 +0000
@@ -21,6 +21,7 @@
 #ifndef OAU_APPLICATION_MANAGER_H
 #define OAU_APPLICATION_MANAGER_H
 
+#include <Accounts/Application>
 #include <QObject>
 #include <QStringList>
 #include <QVariantMap>
@@ -45,6 +46,7 @@
                                                 const QString &appId) const;
     Q_INVOKABLE QStringList removeApplicationFromAcl(const QStringList &acl,
                                                      const QString &appId) const;
+    Accounts::Application applicationFromProfile(const QString &profile);
 
 protected:
     explicit ApplicationManager(QObject *parent = 0);

=== modified file 'tests/online-accounts-ui/tst_application_manager.cpp'
--- tests/online-accounts-ui/tst_application_manager.cpp	2014-05-14 13:31:42 +0000
+++ tests/online-accounts-ui/tst_application_manager.cpp	2014-06-06 07:21:21 +0000
@@ -51,6 +51,8 @@
     void testAclAdd();
     void testAclRemove_data();
     void testAclRemove();
+    void testApplicationFromProfile_data();
+    void testApplicationFromProfile();
 
 private:
     void clearApplicationsDir();
@@ -360,6 +362,76 @@
     QCOMPARE(acl.toSet(), newAcl.toSet());
 }
 
+void ApplicationManagerTest::testApplicationFromProfile_data()
+{
+    QTest::addColumn<QString>("applicationId");
+    QTest::addColumn<QString>("contents");
+    QTest::addColumn<QString>("profile");
+    QTest::addColumn<bool>("isValid");
+
+    QTest::newRow("id-same-as-profile") <<
+        "com.ubuntu.test_MyApp_0.2" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp\">\n"
+        "  <description>My application</description>\n"
+        "  <profile>com.ubuntu.test_MyApp_0.2</profile>\n"
+        "</application>" <<
+        "com.ubuntu.test_MyApp_0.2" <<
+        true;
+
+    QTest::newRow("id-with-no-version") <<
+        "com.ubuntu.test_MyApp2" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp2\">\n"
+        "  <description>My application 2</description>\n"
+        "  <profile>com.ubuntu.test_MyApp2_0.2</profile>\n"
+        "</application>" <<
+        "com.ubuntu.test_MyApp2_0.2" <<
+        true;
+
+    QTest::newRow("id-is-just-package") <<
+        "com.ubuntu.test" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp3\">\n"
+        "  <description>My application 3</description>\n"
+        "  <profile>com.ubuntu.test_MyApp3_0.2</profile>\n"
+        "</application>" <<
+        "com.ubuntu.test_MyApp3_0.2" <<
+        true;
+
+    QTest::newRow("not found") <<
+        "com.ubuntu.test_MyApp5" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp4\">\n"
+        "  <description>My application 4</description>\n"
+        "  <profile>com.ubuntu.test_MyApp4_0.2</profile>\n"
+        "</application>" <<
+        "com.ubuntu.test_MyApp4_0.2" <<
+        false;
+}
+
+void ApplicationManagerTest::testApplicationFromProfile()
+{
+    clearApplicationsDir();
+
+    QFETCH(QString, applicationId);
+    QFETCH(QString, contents);
+    QFETCH(QString, profile);
+    QFETCH(bool, isValid);
+
+    writeAccountsFile(applicationId + ".application", contents);
+
+    ApplicationManager manager;
+
+    Accounts::Application app = manager.applicationFromProfile(profile);
+    if (!isValid) {
+        QVERIFY(!app.isValid());
+    } else {
+        QVERIFY(app.isValid());
+        QCOMPARE(app.name(), applicationId);
+    }
+}
+
 QTEST_MAIN(ApplicationManagerTest);
 
 #include "tst_application_manager.moc"