Merge lp:~jonas-drange/ubuntu-ui-extras/add-loadprinter into lp:~phablet-team/ubuntu-ui-extras/printer-components

[Jonas G. Drange]

adds loadPrinter method on Printers

adds loadPrinter method on Printers

[Andrew Hayzen (ahayzen)]

LGTM, helps QML deal with loading lazy loaded printers in a sane way :-)

review: Approve

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-02-23 14:04:26 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-02-24 12:22:17 +0000
@@ -228,3 +228,16 @@
         }
     }
 }
+
+void Printers::loadPrinter(const QString &name)
+{
+    auto printer = m_model.getPrinterByName(name);
+    if (!printer) {
+        qWarning() << Q_FUNC_INFO << "no known printer named" << name;
+        return;
+    }
+
+    if (printer->type() == PrinterEnum::PrinterType::ProxyType) {
+        m_backend->requestPrinter(name);
+    }
+}

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.h'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.h	2017-02-23 14:04:26 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.h	2017-02-24 12:22:17 +0000
@@ -80,6 +80,9 @@
 
     bool removePrinter(const QString &name);
 
+    // Instruct us to start (eagerly) loading a printer.
+    void loadPrinter(const QString &name);
+
 private Q_SLOTS:
     void jobAdded(QSharedPointer<PrinterJob> job);
     void printerAdded(QSharedPointer<Printer> printer);

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-02-23 14:05:05 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-02-24 12:22:17 +0000
@@ -281,6 +281,13 @@
         return m_defaultPrinterName;
     }
 
+
+    virtual void requestPrinter(const QString &printerName) override
+    {
+        m_requestedPrinters << printerName;
+    }
+
+
     void mockPrinterAdded(
         const QString &text,
         const QString &printerUri,
@@ -374,6 +381,7 @@
     QStringList m_availablePrinterNames;
     QList<QSharedPointer<Printer>> m_availablePrinters;
     QList<QSharedPointer<PrinterJob>> m_jobs;
+    QStringList m_requestedPrinters;
 
 Q_SIGNALS:
     void printToFile(const QString &filepath, const QString &title);

=== modified file 'tests/unittests/Printers/tst_printers.cpp'
--- tests/unittests/Printers/tst_printers.cpp	2017-02-23 13:00:05 +0000
+++ tests/unittests/Printers/tst_printers.cpp	2017-02-24 12:22:17 +0000
@@ -227,6 +227,21 @@
         auto printerJobs = p.allPrinters()->data(p.allPrinters()->index(0,0), PrinterModel::Roles::JobRole).value<QAbstractItemModel*>();
         QCOMPARE(printerJobs->rowCount(), 1);
     }
+    void testLoadPrinter()
+    {
+        MockPrinterBackend *backend = new MockPrinterBackend;
+        Printers p(backend);
+
+        // Harmless to request non-existent one.
+        p.loadPrinter("foo");
+
+        // Load a printer and request it.
+        MockPrinterBackend *printerBackend = new MockPrinterBackend("printer-a");
+        auto printer = QSharedPointer<Printer>(new Printer(printerBackend));
+        backend->mockPrinterLoaded(printer);
+        p.loadPrinter("printer-a");
+        QVERIFY(backend->m_requestedPrinters.contains("printer-a"));
+    }
 };
 
 QTEST_GUILESS_MAIN(TestPrinters)