Merge lp:~ahayzen/ubuntu-ui-extras/printer-components-fix-empty-commented-tests into lp:~phablet-team/ubuntu-ui-extras/printer-components

[Andrew Hayzen]

* Fix/add commented or empty tests

* Fix/add commented or empty tests

[lp:~ahayzen/ubuntu-ui-extras/printer-components-fix-empty-commented-tests]

131. By Andrew Hayzen on 2017-02-23

* Remove Q_UNUSED on parameters that are now used :-)

[Jonas G. Drange (jonas-drange)]

That's great stuff, Andrew. Thanks :)

review: Approve

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-02-23 10:20:08 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-02-23 13:37:42 +0000
@@ -84,7 +84,7 @@
 
     virtual QString printerSetDefault(const QString &name) override
     {
-        Q_UNUSED(name);
+        m_defaultPrinterName = name;
         return returnValue;
     }
 
@@ -221,8 +221,21 @@
 
     virtual void cancelJob(const QString &name, const int jobId) override
     {
-        Q_UNUSED(name);
-        Q_UNUSED(jobId);
+        QList<int> toRemove;
+
+        for (int i=0; i < m_jobs.count(); i++) {
+            QSharedPointer<PrinterJob> job = m_jobs[i];
+
+            if (job->printerName() == name && job->jobId() == jobId) {
+                toRemove << i;
+            }
+        }
+
+        for (int i=0; i < toRemove.count(); i++) {
+            QSharedPointer<PrinterJob> job = m_jobs.takeAt(toRemove[i] - i);
+
+            Q_EMIT jobCompleted(job->title(), "", job->printerName(), 1, "", true, job->jobId(), 1, "", "", 1);
+        }
     }
 
     virtual int printFileToDest(const QString &filepath,

=== modified file 'tests/unittests/Printers/tst_printerfilter.cpp'
--- tests/unittests/Printers/tst_printerfilter.cpp	2017-02-21 10:46:29 +0000
+++ tests/unittests/Printers/tst_printerfilter.cpp	2017-02-23 13:37:42 +0000
@@ -73,43 +73,52 @@
         QCOMPARE(modelCountSpy.count(), 1);
         QCOMPARE(filterCountSpy.count(), 1);
     }
-    // void testMoveOnPrintersLoaded()
-    // {
-    //     // Setup two printers
-    //     PrinterBackend* printerABackend = new MockPrinterBackend("a-printer");
-    //     auto printerA = QSharedPointer<Printer>(new Printer(printerABackend));
-    //     PrinterBackend* printerBBackend = new MockPrinterBackend("b-printer");
-    //     auto printerB = QSharedPointer<Printer>(new Printer(printerBBackend));
-
-    //     getBackend()->m_availablePrinterNames << printerA->name() << printerB->name();
-
-    //     getBackend()->mockPrinterLoaded(printerA);
-    //     getBackend()->mockPrinterLoaded(printerB);
-
-    //     QCOMPARE(m_model->count(), 2);
-
-    //     // Setup spy and move a printer
-    //     int from = 1;
-    //     int to = 0;
-    //     qWarning() << "before move" << getBackend()->m_availablePrinterNames;
-    //     getBackend()->m_availablePrinterNames.move(from, to);
-    //     qWarning() << "after move" << getBackend()->m_availablePrinterNames;
-
-    //     // Check signals were fired
-    //     QSignalSpy moveSpy(m_model, SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
-
-    //     // If a printer is re-named, we would expect a move signal.
-    //     getBackend()->mockPrinterModified("Test renamed printer", "", printerB->name(), 0, "", true);
-
-    //     QCOMPARE(moveSpy.count(), 1);
-    //     QCOMPARE(m_model->count(), 2);
-
-    //     // Check item was moved from -> to
-    //     QList<QVariant> args = moveSpy.at(0);
-    //     QCOMPARE(args.at(1).toInt(), from);
-    //     QCOMPARE(args.at(2).toInt(), from);
-    //     QCOMPARE(args.at(4).toInt(), to);
-    // }
+    void testMoveOnPrintersLoaded()
+    {
+        QScopedPointer<PrinterBackend> backend(new MockPrinterBackend);
+        PrinterModel *model = new PrinterModel(backend.data());
+
+        // Setup two printers
+        PrinterBackend* printerCBackend = new MockPrinterBackend("c-printer");
+        auto printerC = QSharedPointer<Printer>(new Printer(printerCBackend));
+        PrinterBackend* printerDBackend = new MockPrinterBackend("d-printer");
+        auto printerD = QSharedPointer<Printer>(new Printer(printerDBackend));
+
+        // Setup a filter
+        PrinterFilter *filter = new PrinterFilter();
+        filter->setSourceModel(model);
+        filter->setSortRole(PrinterModel::Roles::DefaultPrinterRole);
+        filter->sort(0, Qt::DescendingOrder);
+
+        // Load the two printers
+        ((MockPrinterBackend*) backend.data())->mockPrinterLoaded(printerC);
+        ((MockPrinterBackend*) backend.data())->mockPrinterLoaded(printerD);
+
+        QCOMPARE(filter->count(), 3);
+
+        // Check the printer names before change
+        QCOMPARE(filter->get(0).value("name").toString(), QStringLiteral("c-printer"));
+        QCOMPARE(filter->get(1).value("name").toString(), QStringLiteral("d-printer"));
+        QCOMPARE(filter->get(2).value("name").toString(), QStringLiteral("Create PDF"));
+
+        // Setup spy
+        QSignalSpy dataSpy(filter, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+
+        // Change the name of the 2nd printer so it is 1st
+        printerDBackend->setPrinterNameInternal("a-printer");
+
+        QModelIndex idx = model->index(1);
+        model->dataChanged(idx, idx);
+
+        QTRY_COMPARE(dataSpy.count(), 1);
+
+        // Check the printer names after change
+        QCOMPARE(filter->get(0).value("name").toString(), QStringLiteral("a-printer"));
+        QCOMPARE(filter->get(1).value("name").toString(), QStringLiteral("c-printer"));
+        QCOMPARE(filter->get(2).value("name").toString(), QStringLiteral("Create PDF"));
+
+        delete model;
+    }
 };
 
 QTEST_GUILESS_MAIN(TestPrinterFilter)

=== modified file 'tests/unittests/Printers/tst_printers.cpp'
--- tests/unittests/Printers/tst_printers.cpp	2017-02-21 10:46:29 +0000
+++ tests/unittests/Printers/tst_printers.cpp	2017-02-23 13:37:42 +0000
@@ -96,19 +96,96 @@
     }
     void testCreateJob()
     {
-
+        // Setup the backend with a printer
+        const QString printerName = QStringLiteral("test-printer");
+
+        MockPrinterBackend *backend = new MockPrinterBackend;
+        Printers p(backend);
+
+        MockPrinterBackend *printerBackend = new MockPrinterBackend(printerName);
+        auto printer = QSharedPointer<Printer>(new Printer(printerBackend));
+        backend->mockPrinterLoaded(printer);
+
+        // Create a job
+        PrinterJob *job = p.createJob(printerName);
+
+        // Check it has a printerName
+        QCOMPARE(job->printerName(), printerName);
     }
     void testCancelJob()
     {
-
+        MockPrinterBackend *backend = new MockPrinterBackend;
+        JobModel *model = new JobModel(backend);
+        Printers p(backend);
+
+        // Add one.
+        QSharedPointer<PrinterJob> job = QSharedPointer<PrinterJob>(new PrinterJob("test-printer", backend));
+        backend->m_jobs << job;
+        backend->mockJobCreated("", "", "", 1, "", true, 100, 1, "", "", 1);
+
+        // Check it was added
+        QCOMPARE(model->count(), 1);
+
+        // Setup the spy
+        QSignalSpy removeSpy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+
+        // Cancel the job
+        p.cancelJob(job->printerName(), job->jobId());
+
+        // Check item was removed
+        QTRY_COMPARE(removeSpy.count(), 1);
+
+        QList<QVariant> args = removeSpy.at(0);
+        QCOMPARE(args.at(1).toInt(), 0);
+        QCOMPARE(args.at(2).toInt(), 0);
     }
     void testPrinterRemove()
     {
-        // TODO
+        // Load the backend with a printer
+        const QString printerName = QStringLiteral("test-printer");
+
+        MockPrinterBackend *backend = new MockPrinterBackend;
+
+        MockPrinterBackend *printerBackend = new MockPrinterBackend(printerName);
+        auto printer = QSharedPointer<Printer>(new Printer(printerBackend));
+
+        backend->m_availablePrinterNames << printerName;
+        backend->m_availablePrinters << printer;
+
+        Printers printers(backend);
+        auto all = printers.allPrinters();
+
+        // Check the initial printer count
+        QCOMPARE(all->rowCount(), 1);
+
+        // Setup a spy
+        QSignalSpy removeSpy(all, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+
+        // Remove the item
+        printers.removePrinter(printerName);
+        backend->mockPrinterDeleted("", "", printerName, 1, "", true);
+
+        // Check item was removed
+        QTRY_COMPARE(removeSpy.count(), 1);
+
+        QList<QVariant> args = removeSpy.at(0);
+        QCOMPARE(args.at(1).toInt(), 0);
+        QCOMPARE(args.at(2).toInt(), 0);
+
+        QCOMPARE(all->rowCount(), 0);
     }
     void testSetDefault()
     {
-
+        const QString defaultPrinterName = QStringLiteral("my-default-printer");
+
+        MockPrinterBackend *backend = new MockPrinterBackend;
+        Printers p(backend);
+
+        QCOMPARE(p.defaultPrinterName(), QString());
+
+        p.setDefaultPrinterName(defaultPrinterName);
+
+        QCOMPARE(p.defaultPrinterName(), defaultPrinterName);
     }
     /* Test that Printers successfully assigns printers to jobs whenever
     they appear, as well as assigning job proxies to printers whenever they