Merge lp:~mardy/ubuntu-system-settings-online-accounts/hide-unused-plugins into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Hide providers which no application can use

Filter the provider list to include only those providers which can be used by installed applications. If there are no applications which can use a certain account, hide the relative provider from the list of creatable accounts.

Hide providers which no application can use

Filter the provider list to include only those providers which can be used by installed applications. If there are no applications which can use a certain account, hide the relative provider from the list of creatable accounts.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/253/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/723
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/41
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/723
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/723/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23662

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/253/rebuild

review: Needs Fixing (continuous-integration)

[David Barth (dbarth)]

review: Approve

[lp:~mardy/ubuntu-system-settings-online-accounts/hide-unused-plugins]

298. By Alberto Mardegan on 2015-11-26

Fix autopilot tests

Copy the files from the uoa-integration-tests package, which is no longer needed.

299. By Alberto Mardegan on 2015-11-26

Merge trunk

[ Alberto Mardegan ]
* Retry authentication on network errors (LP: #1504099, #1349975)
[ Alberto Mardegan ]
* Use version 1.3 of Ubuntu.Components (LP: #1508363, #1511055)
[ CI Train Bot ]
* Resync trunk.
[ Alberto Mardegan ]
* Regenerate hooks whenever file time changes (LP: #1510640)
[ CI Train Bot ]
* Resync trunk. added: po/hi.po
[ Alberto Mardegan ]
* Simplify hooks, load v2api library added: click-hooks/accounts.cpp
  click-hooks/accounts.hook.in click-hooks/acl-updater.cpp click-
  hooks/acl-updater.h click-hooks/click-hooks.pro click-hooks/online-
  accounts-hooks2.pro online-accounts-
  service/com.ubuntu.OnlineAccounts.Manager.service.in tests/click-
  hooks/click-hooks.pro tests/click-hooks/fake_signond.h tests/click-
  hooks/signond.py tests/click-hooks/tst_online_accounts_hooks2.cpp
  tests/click-hooks/tst_online_accounts_hooks2.pro renamed: click-
  hooks/click-hooks.pro => click-hooks/online-accounts-hooks.pro
  tests/click-hooks/click-hooks.pro => tests/click-
  hooks/tst_online_accounts_hooks.pro
[ CI Train Bot ]
* Resync trunk. added: po/mr.po po/th.po

=== modified file 'debian/control'
--- debian/control	2015-11-02 07:28:44 +0000
+++ debian/control	2015-11-26 16:02:38 +0000
@@ -127,7 +127,6 @@
          ${python3:Depends},
          autopilot-qt5,
          ubuntu-system-settings-online-accounts (>= ${binary:Version}),
-         uoa-integration-tests,
          libqt5test5,
          python3-autopilot,
 Description: Online Accounts setup for Ubuntu Touch - tests

=== modified file 'debian/rules'
--- debian/rules	2014-10-06 08:44:37 +0000
+++ debian/rules	2015-11-26 16:02:38 +0000
@@ -15,7 +15,7 @@
 
 override_dh_install:
 	rm -rf debian/*/usr/share/accounts/qml-plugins/example
-	rm -rf debian/*/usr/share/accounts/providers
+	rm -rf debian/*/usr/share/accounts/providers/example.provider
 	rm -rf debian/*/usr/tests
 	dh_install --fail-missing
 

=== modified file 'debian/ubuntu-system-settings-online-accounts-autopilot.install'
--- debian/ubuntu-system-settings-online-accounts-autopilot.install	2013-09-25 11:38:44 +0000
+++ debian/ubuntu-system-settings-online-accounts-autopilot.install	2015-11-26 16:02:38 +0000
@@ -1,1 +1,2 @@
 usr/lib/python*/dist-packages/online_accounts_ui/*
+usr/share/accounts/

=== modified file 'plugins/OnlineAccountsPlugin/application-manager.cpp'
--- plugins/OnlineAccountsPlugin/application-manager.cpp	2014-11-07 08:34:05 +0000
+++ plugins/OnlineAccountsPlugin/application-manager.cpp	2015-11-26 16:02:38 +0000
@@ -205,6 +205,21 @@
     return info;
 }
 
+QStringList ApplicationManager::usefulProviders() const
+{
+    AccountManager *manager = AccountManager::instance();
+    Accounts::ServiceList allServices = manager->serviceList();
+    QStringList providers;
+    Q_FOREACH(const Accounts::Service &service, allServices) {
+        if (providers.contains(service.provider())) continue;
+
+        if (!manager->applicationList(service).isEmpty()) {
+            providers.append(service.provider());
+        }
+    }
+    return providers;
+}
+
 QStringList
 ApplicationManager::addApplicationToAcl(const QStringList &acl,
                                         const QString &applicationId) const

=== modified file 'plugins/OnlineAccountsPlugin/application-manager.h'
--- plugins/OnlineAccountsPlugin/application-manager.h	2014-10-03 14:56:11 +0000
+++ plugins/OnlineAccountsPlugin/application-manager.h	2015-11-26 16:02:38 +0000
@@ -44,6 +44,8 @@
                                             const QString &profile);
     QVariantMap providerInfo(const QString &providerId) const;
 
+    Q_INVOKABLE QStringList usefulProviders() const;
+
     Q_INVOKABLE QStringList addApplicationToAcl(const QStringList &acl,
                                                 const QString &appId) const;
     Q_INVOKABLE QStringList removeApplicationFromAcl(const QStringList &acl,

=== modified file 'system-settings-plugin/ProvidersList.qml'
--- system-settings-plugin/ProvidersList.qml	2015-10-29 13:43:52 +0000
+++ system-settings-plugin/ProvidersList.qml	2015-11-26 16:02:38 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Plugin 1.0
 
 Column {
     id: root
@@ -33,9 +34,29 @@
         id: providerModel
     }
 
+    ListModel {
+        id: filteredProviderModel
+        function populate() {
+            var length = providerModel.count
+            var usefulProviders = ApplicationManager.usefulProviders()
+            for (var i = 0; i < length; i++) {
+                var providerId = providerModel.get(i, "providerId")
+                if (usefulProviders.indexOf(providerId) < 0) continue
+                var provider = {
+                    "providerId": providerId,
+                    "displayName": providerModel.get(i, "displayName"),
+                    "iconName": providerModel.get(i, "iconName"),
+                    "isSingleAccount": providerModel.get(i, "isSingleAccount"),
+                    "translations": providerModel.get(i, "translations")
+                }
+                filteredProviderModel.append(provider)
+            }
+        }
+    }
+
     Repeater {
         id: repeater
-        model: providerModel
+        model: filteredProviderModel
 
         delegate: ListItem.Standard {
             id: provider
@@ -73,6 +94,8 @@
         }
     }
 
+    Component.onCompleted: filteredProviderModel.populate()
+
     function clearPressedButtons() {
         for (var i = 0; i < repeater.count; i++) {
             repeater.itemAt(i).activated = false

=== modified file 'tests/autopilot/autopilot.pro'
--- tests/autopilot/autopilot.pro	2014-05-27 16:15:06 +0000
+++ tests/autopilot/autopilot.pro	2015-11-26 16:02:38 +0000
@@ -4,4 +4,21 @@
 
 autopilot.path = $${INSTALL_PREFIX}/lib/python3/dist-packages/
 autopilot.files = online_accounts_ui
-INSTALLS = autopilot
+INSTALLS += autopilot
+
+service.path = $${INSTALL_PREFIX}/share/accounts/services
+service.files = \
+    data/ussoa-fake-service.service \
+    data/ussoa-test-login-photos.service
+INSTALLS += service
+
+provider.path = $${INSTALL_PREFIX}/share/accounts/providers
+provider.files = \
+    data/ussoa-fake-oauth.provider \
+    data/ussoa-test-login.provider
+INSTALLS += provider
+
+application.path = $${INSTALL_PREFIX}/share/accounts/applications
+application.files = \
+    data/ussoa-integration-tests.application
+INSTALLS += application

=== added directory 'tests/autopilot/data'
=== added file 'tests/autopilot/data/ussoa-fake-oauth.provider'
--- tests/autopilot/data/ussoa-fake-oauth.provider	1970-01-01 00:00:00 +0000
+++ tests/autopilot/data/ussoa-fake-oauth.provider	2015-11-26 16:02:38 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="ussoa-fake-oauth">
+  <name>FakeOAuth</name>
+  <icon>fake-oauth</icon>
+  <translations>account-plugins</translations>
+  <domains>.*example\.com</domains>
+  <plugin>generic-oauth</plugin>
+
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">user_agent</setting>
+      <group name="oauth2">
+        <group name="user_agent">
+          <setting name="Host">localhost:5120</setting>
+          <setting name="AuthPath">o/oauth2/auth</setting>
+          <setting name="RedirectUri">https://localhost:5120/success.html</setting>
+          
+          <setting name="ResponseType">code</setting>
+          <setting type="as" name="Scope">['read-data','write-data']</setting>
+          <setting name="ClientId">niceclientid</setting>
+					<setting name="IgnoreSslErrors" type="b">true</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>

=== added file 'tests/autopilot/data/ussoa-fake-service.service'
--- tests/autopilot/data/ussoa-fake-service.service	1970-01-01 00:00:00 +0000
+++ tests/autopilot/data/ussoa-fake-service.service	2015-11-26 16:02:38 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="ussoa-fake-service">
+  <type>other</type>
+  <name>Integration tests</name>
+  <provider>ussoa-fake-oauth</provider>
+</service>

=== added file 'tests/autopilot/data/ussoa-integration-tests.application'
--- tests/autopilot/data/ussoa-integration-tests.application	1970-01-01 00:00:00 +0000
+++ tests/autopilot/data/ussoa-integration-tests.application	2015-11-26 16:02:38 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application id="ussoa-integration-tests">
+  <description>IntegrationTests</description>
+  <services>
+    <service id="ussoa-fake-service">
+      <description>Integration test 1</description>
+    </service>
+    <service id="ussoa-test-login-photos">
+      <description>Integration test 2</description>
+    </service>
+  </services>
+</application>

=== added file 'tests/autopilot/data/ussoa-test-login-photos.service'
--- tests/autopilot/data/ussoa-test-login-photos.service	1970-01-01 00:00:00 +0000
+++ tests/autopilot/data/ussoa-test-login-photos.service	2015-11-26 16:02:38 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="ussoa-test-login-photos">
+  <type>ussoa-test-photos</type>
+  <name>TestLogin Photos</name>
+  <provider>ussoa-test-login</provider>
+</service>

=== added file 'tests/autopilot/data/ussoa-test-login.provider'
--- tests/autopilot/data/ussoa-test-login.provider	1970-01-01 00:00:00 +0000
+++ tests/autopilot/data/ussoa-test-login.provider	2015-11-26 16:02:38 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="ussoa-test-login">
+  <name>TestLogin</name>
+  <icon>test-login</icon>
+  <translations>account-plugins</translations>
+  <domains>.*example\.com</domains>
+
+  <template>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
+  </template>
+</provider>

=== modified file 'tests/plugin/tst_application_manager.cpp'
--- tests/plugin/tst_application_manager.cpp	2014-11-07 08:34:05 +0000
+++ tests/plugin/tst_application_manager.cpp	2015-11-26 16:02:38 +0000
@@ -34,6 +34,18 @@
 
 using namespace OnlineAccountsUi;
 
+namespace QTest {
+template<>
+char *toString(const QSet<QString> &set)
+{
+    QByteArray ba = "QSet<QString>(";
+    QStringList list = set.toList();
+    ba += list.join(", ");
+    ba += ")";
+    return qstrdup(ba.data());
+}
+} // QTest namespace
+
 class ApplicationManagerTest: public QObject
 {
     Q_OBJECT
@@ -54,6 +66,8 @@
     void testApplicationFromProfile();
     void testProviderInfo_data();
     void testProviderInfo();
+    void testUsefulProviders_data();
+    void testUsefulProviders();
 
 private:
     void clearApplicationsDir();
@@ -123,6 +137,7 @@
 {
     qputenv("ACCOUNTS", TEST_DIR);
     qputenv("XDG_DATA_HOME", TEST_DIR);
+    qputenv("XDG_DATA_DIRS", TEST_DIR);
 
     clearTestDir();
 
@@ -561,6 +576,128 @@
     QCOMPARE(info.value("isSingleAccount").toBool(), isSingleAccount);
 }
 
-QTEST_MAIN(ApplicationManagerTest);
+void ApplicationManagerTest::testUsefulProviders_data()
+{
+    QTest::addColumn<QStringList>("applicationIds");
+    QTest::addColumn<QStringList>("contents");
+    QTest::addColumn<QStringList>("expectedProviders");
+
+    QStringList applicationIds;
+    QStringList contents;
+    applicationIds << "com.ubuntu.test_MyApp";
+    contents <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp\">\n"
+        "  <description>My application</description>\n"
+        "</application>";
+    QTest::newRow("no-services") <<
+        applicationIds << contents <<
+        QStringList();
+    applicationIds.clear();
+    contents.clear();
+
+    applicationIds <<
+        "com.ubuntu.test_MyApp2";
+    contents <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp2\">\n"
+        "  <description>My application 2</description>\n"
+        "  <service-types>\n"
+        "    <service-type id=\"some type\">Do something</service-type>\n"
+        "  </service-types>\n"
+        "</application>";
+    QTest::newRow("no-valid-services") <<
+        applicationIds << contents <<
+        QStringList();
+    applicationIds.clear();
+    contents.clear();
+
+    applicationIds <<
+        "com.ubuntu.test_MyApp3";
+    contents <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp3\">\n"
+        "  <description>My application 3</description>\n"
+        "  <service-types>\n"
+        "    <service-type id=\"tstemail\">\n"
+        "      <description>Send email</description>\n"
+        "    </service-type>\n"
+        "  </service-types>\n"
+        "</application>";
+    QTest::newRow("email-services") <<
+        applicationIds << contents <<
+        (QStringList() << "cool" << "bad");
+    applicationIds.clear();
+    contents.clear();
+
+    applicationIds <<
+        "com.ubuntu.test_MyApp4";
+    contents <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp4\">\n"
+        "  <description>My application 4</description>\n"
+        "  <services>\n"
+        "    <service id=\"cool-mail\">\n"
+        "      <description>Send email</description>\n"
+        "    </service>\n"
+        "    <service id=\"cool-sharing\">\n"
+        "      <description>Share stuff</description>\n"
+        "    </service>\n"
+        "  </services>\n"
+        "</application>";
+    QTest::newRow("cool-services") <<
+        applicationIds << contents <<
+        (QStringList() << "cool");
+    applicationIds.clear();
+    contents.clear();
+
+    applicationIds <<
+        "com.ubuntu.test_MyApp5" <<
+        "com.ubuntu.test_MyApp6";
+    contents <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp5\">\n"
+        "  <description>My application 5</description>\n"
+        "  <services>\n"
+        "    <service id=\"cool-mail\">\n"
+        "      <description>Send email</description>\n"
+        "    </service>\n"
+        "  </services>\n"
+        "</application>" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_MyApp6\">\n"
+        "  <description>My application 6</description>\n"
+        "  <services>\n"
+        "    <service id=\"bad-sharing\">\n"
+        "      <description>Share stuff</description>\n"
+        "    </service>\n"
+        "  </services>\n"
+        "</application>";
+    QTest::newRow("two apps") <<
+        applicationIds << contents <<
+        (QStringList() << "cool" << "bad");
+    applicationIds.clear();
+    contents.clear();
+}
+
+void ApplicationManagerTest::testUsefulProviders()
+{
+    clearApplicationsDir();
+
+    QFETCH(QStringList, applicationIds);
+    QFETCH(QStringList, contents);
+    QFETCH(QStringList, expectedProviders);
+
+    for (int i = 0; i < applicationIds.count(); i++) {
+        writeAccountsFile(applicationIds[i] + ".application", contents[i]);
+    }
+
+    ApplicationManager manager;
+
+    QStringList providers = manager.usefulProviders();
+    QCOMPARE(providers.toSet(), expectedProviders.toSet());
+}
+
+QTEST_GUILESS_MAIN(ApplicationManagerTest);
 
 #include "tst_application_manager.moc"

=== modified file 'tests/plugin/tst_application_manager.pro'
--- tests/plugin/tst_application_manager.pro	2014-10-03 14:56:11 +0000
+++ tests/plugin/tst_application_manager.pro	2015-11-26 16:02:38 +0000
@@ -8,6 +8,7 @@
 QT += \
     dbus \
     qml
+QT -= gui
 
 PKGCONFIG += \
     accounts-qt5