Merge lp:~ahayzen/ubuntu-ui-extras/fix-colorModel-no-update into lp:ubuntu-ui-extras/staging

[Andrew Hayzen]

* Fix changing of printer not loading defaults and add a test
* Improve colorModel struct to != when name or colorModelType are different

* Fix changing of printer not loading defaults and add a test
* Improve colorModel struct to != when name or colorModelType are different

[Jonas G. Drange (jonas-drange)]

Could you clarify “loaded job” on L15?

review: Needs Information

[lp:~ahayzen/ubuntu-ui-extras/fix-colorModel-no-update]

135. By Andrew Hayzen on 2017-04-03

* Update comments

[Andrew Hayzen (ahayzen)]

Updated the comment :-)

[Jonas G. Drange (jonas-drange)]

This makes good sense now, and thanks for updating the comment. Also, +1 for the tests!

review: Approve

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:134
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-ui-extras-staging-ci/8/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2380
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2380
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2193
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2193
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2193
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2193
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2193
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2193
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2193/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-ui-extras-staging-ci/8/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-03-16 15:47:11 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-04-03 11:59:25 +0000
@@ -215,13 +215,9 @@
         return;
     }
 
-    if (jobId() > 0) {
-        loadAttributes(
-            m_backend->printerGetJobAttributes(
-                printerName(), jobId()
-            )
-        );
-    } else {
+    // Only load the defaults if this isn't a job in the queue (one which has a
+    // jobId) as this is when user is making a job and has changed the printer
+    if (jobId() <= 0) {
         setColorModel(m_printer->supportedColorModels().indexOf(m_printer->defaultColorModel()));
         setDuplexMode(m_printer->supportedDuplexModes().indexOf(m_printer->defaultDuplexMode()));
         setQuality(m_printer->supportedPrintQualities().indexOf(m_printer->defaultPrintQuality()));
@@ -401,6 +397,9 @@
             Q_EMIT printerNameChanged();
         }
 
+        // When the printer changes ensure we update any defaults
+        loadDefaults();
+
         Q_EMIT printerChanged();
    }
 }

=== modified file 'modules/Ubuntu/Components/Extras/Printers/structs.h'
--- modules/Ubuntu/Components/Extras/Printers/structs.h	2017-03-16 15:34:02 +0000
+++ modules/Ubuntu/Components/Extras/Printers/structs.h	2017-04-03 11:59:25 +0000
@@ -36,13 +36,15 @@
 
     bool operator==(const ColorModel& a) const
     {
-        return (name == a.name && originalOption == a.originalOption);
+        return (name == a.name && originalOption == a.originalOption
+                && text == a.text && colorType == a.colorType);
     }
     bool operator!=(const ColorModel& a) const
     {
         return !(*this == a);
     }
     void operator=(const ColorModel &m) {
+        colorType = m.colorType;
         name = m.name;
         text = m.text;
         originalOption = m.originalOption;

=== modified file 'tests/unittests/Printers/tst_printerjob.cpp'
--- tests/unittests/Printers/tst_printerjob.cpp	2017-03-14 14:47:54 +0000
+++ tests/unittests/Printers/tst_printerjob.cpp	2017-04-03 11:59:25 +0000
@@ -304,6 +304,43 @@
         QCOMPARE(m_instance->title(), title);
     }
 
+    void testSetPrinterLoadDefaults()
+    {
+        ColorModel a;
+        a.colorType = PrinterEnum::ColorModelType::GrayType;
+        a.text = "Gray";
+
+        ColorModel b;
+        b.colorType = PrinterEnum::ColorModelType::ColorType;
+        b.text = "RGB";
+        QList<ColorModel> models({a, b});
+
+
+        MockPrinterBackend *backend1 = new MockPrinterBackend("printer1");
+        backend1->printerOptions["printer1"].insert("SupportedColorModels", QVariant::fromValue(models));
+        backend1->printerOptions["printer1"].insert("DefaultColorModel", QVariant::fromValue(a));
+        QSharedPointer<Printer> printer1 = QSharedPointer<Printer>(new Printer(backend1));
+
+        MockPrinterBackend *backend2 = new MockPrinterBackend("printer2");
+        backend2->printerOptions["printer2"].insert("SupportedColorModels", QVariant::fromValue(models));
+        backend2->printerOptions["printer2"].insert("DefaultColorModel", QVariant::fromValue(b));
+        QSharedPointer<Printer> printer2 = QSharedPointer<Printer>(new Printer(backend2));
+
+        // Base case
+        m_instance->setPrinter(printer1);
+        qDebug() << m_instance->colorModel() << models.indexOf(a);
+        QCOMPARE(m_instance->colorModel(), models.indexOf(a));
+        QCOMPARE(m_instance->getColorModel().text, a.text);
+        QCOMPARE(m_instance->colorModelType(), a.colorType);
+
+        // Change to a different printer and check the default updates
+        m_instance->setPrinter(printer2);
+        qDebug() << m_instance->colorModel() << models.indexOf(b);
+        QCOMPARE(m_instance->colorModel(), models.indexOf(b));
+        QCOMPARE(m_instance->getColorModel().text, b.text);
+        QCOMPARE(m_instance->colorModelType(), b.colorType);
+    }
+
     void testState()
     {
         QCOMPARE(m_instance->state(), PrinterEnum::JobState::Pending);