Merge lp:~bzoltan/ubuntu-ui-toolkit/landing-2015-10-06 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

Fix Ubuntu System Setting application and the UITK AP tests

Fix Ubuntu System Setting application and the UITK AP tests

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-02 16:32:27 +0000
+++ debian/changelog	2015-10-06 09:05:14 +0000
@@ -1,3 +1,16 @@
+ubuntu-ui-toolkit (1.3.1676+15.10.20151006.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Zsombor Egri ] 
+  * StyledItem does no longer fall back to 1.2 style loading on mixed import
+    versions.
+  * Make primaryPage and primaryPageSource replaceable after component 
+    completion. Fixes LP: #1500934
+
+  [ Christian Dywan ]
+  * Merge open_page and _open_page in GalleryTestCase.
+
+ -- Zoltán Balogh <[e-mail]>  Tue, 06 Oct 2015 12:01:56 +0300
+
 ubuntu-ui-toolkit (1.3.1672+15.10.20151002.1-0ubuntu1) wily; urgency=medium
 
   [ Tim Peeters ]

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-09-30 09:46:03 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-10-06 09:05:14 +0000
@@ -42,13 +42,11 @@
   add the page to the leftmost column of the view.
 
   The primary page, the very first page must be specified either through the
-  \l primaryPage or \l primaryPageSource properties. The properties cannot be
-  changed after component completion. \l primaryPage can only hold a Page instance,
-  \l primaryPageSource can either be a Component or a url to a document defining
-  a Page. This page cannot be removed from the view. \l primaryPageSource has
-  precedence over \l primaryPage and will create the Page asynchronously. The
-  page instance will be reported through \l primaryPage property and will replace
-  any previous value set to that property.
+  \l primaryPage or \l primaryPageSource properties. \l primaryPage can only
+  hold a Page instance, \l primaryPageSource can either be a Component or a
+  url to a document defining a Page. \l primaryPageSource has precedence over
+  \l primaryPage, and when set it will report the loaded Page through \l primaryPage
+  property, and will replace any value set into that property.
 
   \qml
     import QtQuick 2.4
@@ -188,17 +186,18 @@
     /*!
       The property holds the first Page which will be added to the view. If the
       view has more than one column, the page will be added to the leftmost column.
-      The property can hold only a Page instance. The property cannot be changed after
-      component completion.
+      The property can only hold a Page instance. When changed runtime (not by the
+      AdaptivePageLayout component itself), the \l primaryPageSource property
+      will be reset.
       */
     property Page primaryPage
 
     /*!
       The property specifies the source of the primaryPage in case the primary
       page is created from a Component or loaded from an external document. It
-      has precedence over \l primaryPage and cannot be changed after component
-      completion. The page specified in this way will be cerated asynchronously
-      and the instance will be reported through \l primaryPage property.
+      has precedence over \l primaryPage. The page specified in this way will
+      be cerated asynchronously and the instance will be reported through
+      \l primaryPage property.
       */
     property var primaryPageSource
 
@@ -322,12 +321,7 @@
       pages will be removed.
       */
     function removePages(page) {
-        var nodeToRemove = d.getWrapper(page);
-        var removedNodes = d.tree.chop(nodeToRemove, page != layout.primaryPage);
-        for (var i = removedNodes.length-1; i >= 0; i--) {
-            var node = removedNodes[i];
-            d.updatePageForColumn(node.column);
-        }
+        d.removeAllPages(page, page != layout.primaryPage);
     }
 
     /*
@@ -345,26 +339,34 @@
             d.createPrimaryPage(primaryPageSource);
         } else if (primaryPage) {
             d.createPrimaryPage(primaryPage);
-        } else {
-            console.warn("No primary page set. No pages can be added without a primary page.");
         }
         d.completed = true;
     }
     onPrimaryPageChanged: {
-        if (d.completed && !d.internalUpdate) {
-            console.warn("Cannot change primaryPage after completion.");
-            d.internalPropertyUpdate("primaryPage", d.lastPrimaryPage);
+        if (!d.completed || d.internalUpdate) {
             return;
         }
-        d.lastPrimaryPage = primaryPage;
+        // reset the primaryPageSource
+        d.internalPropertyUpdate("primaryPageSource", undefined);
+        // clear the layout
+        d.purgeLayout();
+        // add the new page if valid
+        if (primaryPage !== null) {
+            d.createPrimaryPage(primaryPage);
+        }
     }
     onPrimaryPageSourceChanged: {
-        if (d.completed && !d.internalUpdate) {
-            console.warn("Cannot change primaryPageSource after completion.");
-            d.internalPropertyUpdate("primaryPageSource", d.lastPrimaryPageSource);
+        if (!d.completed || d.internalUpdate) {
             return;
         }
-        d.lastPrimaryPageSource = primaryPageSource;
+        // remove all pages first
+        d.purgeLayout();
+        // create the new primary page if a valid component is specified
+        if (primaryPageSource) {
+            d.createPrimaryPage(primaryPageSource);
+        } else {
+            d.internalPropertyUpdate("primaryPage", null);
+        }
     }
 
     onLayoutsChanged: {
@@ -389,8 +391,7 @@
                                   (activeLayout ? activeLayout.data.length : 1)
         property PageColumnsLayout activeLayout: null
         property list<PageColumnsLayout> prevLayouts
-        property Page lastPrimaryPage
-        property var lastPrimaryPageSource
+        property Page prevPrimaryPage
 
         /*! internal */
         onColumnsChanged: {
@@ -416,10 +417,20 @@
                 wrapper.incubator.onStatusChanged = function (status) {
                     if (status == Component.Ready) {
                         internalPropertyUpdate("primaryPage", wrapper.incubator.object);
+                        prevPrimaryPage = wrapper.incubator.object;
                     }
                 }
             } else {
                 finalizeAddingPage(wrapper);
+                prevPrimaryPage = wrapper.object;
+            }
+        }
+
+        // remove all pages, including primaryPage
+        function purgeLayout() {
+            if (prevPrimaryPage) {
+                removeAllPages(prevPrimaryPage, true);
+                prevPrimaryPage = null;
             }
         }
 
@@ -514,6 +525,17 @@
             return newWrapper.incubator;
         }
 
+        // removes all pages from the layout, and may include the page itself
+        function removeAllPages(page, inclusive) {
+            inclusive = typeof inclusive !== 'undefined' ? inclusive : true;
+            var nodeToRemove = d.getWrapper(page);
+            var removedNodes = d.tree.chop(nodeToRemove, inclusive);
+            for (var i = removedNodes.length-1; i >= 0; i--) {
+                var node = removedNodes[i];
+                updatePageForColumn(node.column);
+            }
+        }
+
         // update the page for the specified column
         function updatePageForColumn(column) {
             var effectiveColumn = MathUtils.clamp(column, 0, d.columns - 1);

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-09-28 07:06:36 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-10-06 09:05:14 +0000
@@ -28,6 +28,7 @@
 UCStyledItemBasePrivate::UCStyledItemBasePrivate()
     : styleComponent(Q_NULLPTR)
     , styleItem(Q_NULLPTR)
+    , styleVersion(LATEST_UITK_VERSION)
     , activeFocusOnPress(false)
     , wasStyleLoaded(false)
 {
@@ -307,7 +308,7 @@
     // either styleComponent or styleName is valid
     QQmlComponent *component = styleComponent;
     if (!component) {
-        component = getTheme()->createStyleComponent(styleDocument + ".qml", q);
+        component = getTheme()->createStyleComponent(styleDocument + ".qml", q, styleVersion);
     }
     if (!component) {
         return false;
@@ -473,13 +474,9 @@
     QQmlPropertyData *pdata = QQmlPropertyCache::property(qmlEngine(this), this, QStringLiteral("theme"), cdata, l);
     // FIXME MainView internal styler uses theme property, meaning imports13 will be true,
     // therefore we must check the type of the property as well in case anyone else overrides it
-    bool imports13 = data->propertyCache->isAllowedInRevision(pdata) && (property("theme").type() != QVariant::String);
-    if (!imports13) {
-        // load 1.2 theme
-        UCTheme *theme = d->getTheme();
-        // FIXME: override the global theme version to be used when creating new themes!
-        theme->setVersion(BUILD_VERSION(1, 2));
-    }
+    d->styleVersion = data->propertyCache->isAllowedInRevision(pdata) && (property("theme").type() != QVariant::String)
+            ? BUILD_VERSION(1, 3)
+            : BUILD_VERSION(1, 2);
     // no animation at this time
     // prepare style context if not been done yet
     d->postStyleChanged();

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-09-21 11:40:22 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-10-06 09:05:14 +0000
@@ -64,6 +64,7 @@
     QString styleDocument;
     QQmlComponent *styleComponent;
     QQuickItem *styleItem;
+    quint16 styleVersion;
     bool activeFocusOnPress:1;
     bool wasStyleLoaded:1;
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2015-05-05 17:20:27 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2015-10-06 09:05:14 +0000
@@ -53,6 +53,7 @@
             element = self._find_element(object_name, direction)
         self.swipe_child_into_view(element)
         self.pointing_device.click_object(element)
+        return element
 
     @autopilot_logging.log_action(logger.info)
     def _find_element(self, object_name, direction=None):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2015-09-29 18:31:46 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2015-10-06 09:05:14 +0000
@@ -129,9 +129,11 @@
 
         """
         list_view = self.main_view.select_single(objectName="widgetList")
-        list_view.click_element(page)
-        element = self.main_view.select_single('Standard', objectName=page)
-        element.selected.wait_for(True)
+        element = list_view.click_element(page)
+        # Do not check the ListItem's highlight
+        # the actual highlight is implemented in the UbuntuListView
+        self.checkPageHeader(element.text)
+        return element
 
     def tearDown(self):
         super().tearDown()

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2015-09-23 10:53:59 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2015-10-06 09:05:14 +0000
@@ -109,13 +109,4 @@
 
     def test_open_page(self):
         self.open_page(self.element_name)
-        element = self.main_view.select_single(
-            'Standard', objectName=self.element_name)
-        self.checkPageHeader(element.text)
-        if self.template_name == 'textinputsTemplate':
-            page_type = 'TextInputs'
-        else:
-            page_type = 'Template'
-        self.main_view.wait_select_single(
-            page_type, objectName=self.template_name)
-        # TODO check that the template is visible. --elopio - 2013-11-28
+        self.main_view.wait_select_single(objectName=self.template_name)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py	2015-09-29 18:31:46 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py	2015-10-06 09:05:14 +0000
@@ -16,24 +16,15 @@
 
 """Tests for the Ubuntu UI Toolkit Gallery - UbuntuListView component."""
 
-import ubuntuuitoolkit
 from ubuntuuitoolkit.tests.gallery import GalleryTestCase
 
 
 class UbuntuListViewTestCase(GalleryTestCase):
 
     def _open_page(self):
-        list_view = self.main_view.wait_select_single(objectName="widgetList")
-        list_view.click_element("ubuntuListViewElement")
-        element = self.main_view.select_single(
-            objectName="ubuntuListViewElement")
-        # Do not check the ListItem's highlight
-        # the actual highlight is implemented in the UbuntuListView
-        self.checkPageHeader(element.text)
-        self.main_view.wait_select_single(
-            "Template", objectName="ubuntuListViewTemplate")
+        super().open_page('ubuntuListViewElement')
         self.listView = self.main_view.select_single(
-            ubuntuuitoolkit.UbuntuListView11, objectName="ubuntuListView")
+            objectName="ubuntuListView")
 
     def test_pull_to_refresh_enabled(self):
         self._open_page()

=== modified file 'tests/unit_x11/tst_components/tst_adaptivepagelayout.qml'
--- tests/unit_x11/tst_components/tst_adaptivepagelayout.qml	2015-09-29 10:37:46 +0000
+++ tests/unit_x11/tst_components/tst_adaptivepagelayout.qml	2015-10-06 09:05:14 +0000
@@ -27,83 +27,79 @@
     // 2 on desktop, 1 on phone.
     property int columns: width >= units.gu(80) ? 2 : 1
 
-    AdaptivePageLayout {
-        id: layout
-        width: parent.width
-        height: parent.height
-
-        primaryPage: page1
-
-        Page {
-            id: page1
-            title: "Page1"
-
-            Column {
-                anchors.centerIn: parent
-                width: childrenRect.width
-                Button {
-                    text: "Page 2 left"
-                    onTriggered: layout.addPageToCurrentColumn(page1, page2)
-                }
-                Button {
-                    text: "Page 3 right"
-                    onTriggered: layout.addPageToNextColumn(page1, page3);
-                }
-            }
-        }
-        Page {
-            id: page2
-            title: "Page2"
-        }
-        Page {
-            id: page3
-            title: "Page3"
-        }
-        Page {
-            id: page4
-            title: "Page4"
-        }
-    }
-
-    AdaptivePageLayout {
-        id: defaults
+    Column {
+        anchors.fill: parent
+        AdaptivePageLayout {
+            id: layout
+            width: parent.width
+            height: parent.height / 2
+
+            primaryPage: page1
+
+            Page {
+                id: page1
+                objectName: title
+                title: "Page1"
+
+                Column {
+                    anchors.centerIn: parent
+                    width: childrenRect.width
+                    Button {
+                        text: "Page 2 left"
+                        onTriggered: layout.addPageToCurrentColumn(page1, page2)
+                    }
+                    Button {
+                        text: "Page 3 right"
+                        onTriggered: layout.addPageToNextColumn(page1, page3);
+                    }
+                }
+            }
+            Page {
+                id: page2
+                objectName: title
+                title: "Page2"
+            }
+            Page {
+                id: page3
+                objectName: title
+                title: "Page3"
+            }
+            Page {
+                id: page4
+                objectName: title
+                title: "Page4"
+            }
+        }
+        AdaptivePageLayout {
+            id: defaults
+            width: parent.width
+            height: parent.height / 2
+            Page {
+                id: otherPage1
+                objectName: title
+                title: "Page1"
+            }
+            Page {
+                id: otherPage2
+                objectName: title
+                title: "Page2"
+            }
+            Page {
+                id: otherPage3
+                objectName: title
+                title: "Page3"
+            }
+        }
     }
 
     Component {
         id: pageComponent
         Page {
+            objectName: title
             title: "DynamicPage"
         }
     }
 
-    Component {
-        id: aplComponent
-        AdaptivePageLayout {
-            width: units.gu(40)
-            height: units.gu(50)
-            primaryPageSource: pageComponent
-        }
-    }
-
-    Component {
-        id: aplDocument
-        AdaptivePageLayout {
-            width: units.gu(40)
-            height: units.gu(50)
-            primaryPageSource: Qt.resolvedUrl("MyExternalPage.qml")
-        }
-    }
-
-    Component {
-        id: aplPrecedence
-        AdaptivePageLayout {
-            width: units.gu(40)
-            height: units.gu(50)
-            primaryPage: page1
-            primaryPageSource: Qt.resolvedUrl("MyExternalPage.qml")
-        }
-    }
-
     UbuntuTestCase {
         id: testCase
         when: windowShown
@@ -115,6 +111,10 @@
             target: testCase
             signalName: "pageLoaded"
         }
+        SignalSpy {
+            id: primaryPageSpy
+            signalName: "primaryPageChanged"
+        }
 
         function resize_single_column() {
             layout.width = units.gu(40);
@@ -135,29 +135,38 @@
             return apl.__d.getWrapper(page);
         }
 
+        function findPageFromLayout(apl, objectName) {
+            var body = findChild(apl, "body");
+            verify(body);
+            return findChild(body, objectName);
+        }
+
         function cleanup() {
             page1.title = "Page1";
             page2.title = "Page2";
             page3.title = "Page3";
             page4.title = "Page4";
             loadedSpy.clear();
+            primaryPageSpy.clear();
+            primaryPageSpy.target = null;
             resize_multiple_columns();
-            layout.removePages(page1);
+            layout.removePages(layout.primaryPage);
+            defaults.primaryPage = null;
+            wait(200);
         }
 
         function initTestCase() {
             compare(defaults.primaryPage, null, "primaryPage not null by default");
             compare(defaults.primaryPageSource, undefined, "primaryPageSource not set by default");
             compare(defaults.layouts.length, 0, "no layouts by default");
-            compare(defaults.columns, 1, "1 column as default");
+            compare(defaults.columns, columns, columns + " column(s) as default");
         }
 
         function test_change_primaryPage() {
-            // this prints the warning but still changes the primary page,
-            //  so the test must be executed last not to mess up the other tests.
-            ignoreWarning("Cannot change primaryPage after completion.");
-            layout.primaryPage = page3;
-            verify(layout.primaryPage != page3, "primaryPage value was changed");
+            defaults.primaryPage = otherPage1;
+            defaults.addPageToCurrentColumn(defaults.primaryPage, otherPage2);
+            defaults.primaryPage = otherPage3;
+            verify(!findPageFromLayout(defaults, "Page2"), "Page2 still in the view!");
         }
 
         function test_add_page_when_source_page_not_in_stack() {
@@ -333,10 +342,10 @@
             }
 
             var testPage = testHolder.pageWrapper.object;
-            var prevPageActive = false
+            var prevPageActive = false;
             var incubator = data.nextColumn
                         ? layout.addPageToNextColumn(data.sourcePage, data.page)
-                        : layout.addPageToCurrentColumn(data.sourcePage, data.page);;
+                        : layout.addPageToCurrentColumn(data.sourcePage, data.page);
             verify(incubator);
             compare(testHolder.pageWrapper.object, testPage);
             incubator.onStatusChanged = function (status) {
@@ -351,48 +360,58 @@
 
         function test_primaryPageSource_bug1499179_data() {
             return [
-                {tag: "Component", test: aplComponent},
-                {tag: "Document", test: aplDocument},
+                {tag: "Component", test: pageComponent},
+                {tag: "Document", test: Qt.resolvedUrl("MyExternalPage.qml")},
             ];
         }
         function test_primaryPageSource_bug1499179(data) {
-            var apl = data.test.createObject(root);
-            verify(apl);
-            tryCompareFunction(function () { return apl.primaryPage != null }, true, 1500);
-            apl.visible = false;
-            apl = null;
+            primaryPageSpy.target = defaults;
+            defaults.primaryPageSource = data.test;
+            primaryPageSpy.wait();
         }
 
-        function test_primaryPageSource_not_set_twice_data() {
+        function test_change_primaryPageSource_data() {
             return [
-                {tag: "Component", test: aplComponent, nextValue: null},
-                {tag: "Document", test: aplDocument, nextValue: null},
+                {tag: "Component", test: pageComponent, nextValue: Qt.resolvedUrl("MyExternalPage.qml")},
+                {tag: "Document", test: Qt.resolvedUrl("MyExternalPage.qml"), nextValue: pageComponent},
             ];
         }
-        function test_primaryPageSource_not_set_twice(data) {
-            var apl = data.test.createObject(root);
-            verify(apl);
-            tryCompareFunction(function () { return apl.primaryPage != null }, true, 1500);
-            ignoreWarning("Cannot change primaryPageSource after completion.");
-            apl.primaryPageSource = data.nextValue;
-            verify(apl.primaryPageSource != data.nextValue, "property value changed!");
-            apl.visible = false;
-            apl = null;
-        }
-
-        SignalSpy {
-            id: primaryPageSpy
-            signalName: "primaryPageChanged"
+        function test_change_primaryPageSource(data) {
+            primaryPageSpy.target = defaults;
+            verify(defaults.primaryPage == null);
+            verify(defaults.primaryPageSource == undefined);
+            defaults.primaryPageSource = data.test;
+            primaryPageSpy.wait(400);
+            // add some pages
+            defaults.addPageToCurrentColumn(defaults.primaryPage, otherPage2);
+            // then replace the primaryPageSource
+            primaryPageSpy.clear();
+            defaults.primaryPageSource = data.nextValue;
+            primaryPageSpy.wait(400);
+            // look after page2
+            verify(!findPageFromLayout(defaults, "Page2"), "Page2 still in the view!");
         }
 
         function test_primaryPageSource_precedence_over_primaryPage() {
-            var apl = aplPrecedence.createObject(root);
-            primaryPageSpy.target = apl;
-            verify(apl);
-            primaryPageSpy.wait();
-            verify(apl.primaryPage.title != page1.title, "primaryPage has not been overloaded by primaryPageSource");
-            apl.visible = false;
-            apl = null;
+            primaryPageSpy.target = defaults;
+            defaults.primaryPage = otherPage1;
+            primaryPageSpy.wait(400);
+            // now set a value to primaryPageSource
+            primaryPageSpy.clear();
+            defaults.primaryPageSource = pageComponent;
+            primaryPageSpy.wait(400);
+        }
+
+        function test_primaryPage_change_clears_primaryPageSource() {
+            primaryPageSpy.target = defaults;
+            defaults.primaryPageSource = pageComponent;
+            primaryPageSpy.wait(400);
+            compare(defaults.primaryPage.title, "DynamicPage", "DynamicPage not set as primaryPage");
+            // now set a value to primaryPage
+            primaryPageSpy.clear();
+            defaults.primaryPage = otherPage1;
+            primaryPageSpy.wait(400);
+            compare(defaults.primaryPageSource, undefined, "primaryPageSource must be cleared");
         }
     }
 }

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-09-22 13:40:32 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-10-06 09:05:14 +0000
@@ -636,44 +636,21 @@
     {
         QTest::addColumn<QString>("document");
         QTest::addColumn<QString>("testValue");
-        QTest::addColumn<int>("row");
-        QTest::addColumn<int>("column");
-        QTest::addColumn<QString>("warning");
 
-        QTest::newRow("Theming version 1.2")
-                << "StyledItemV12.qml"
-                << ""
-                << 0 << 0 << "";
         QTest::newRow("Theming version 1.3")
                 << "StyledItemV13.qml"
-                << "version1.3"
-                << 0 << 0 << "";
-        QTest::newRow("Fall back to 1.3")
-                << "StyledItemFallback.qml"
-                << "version1.3"
-                << 19 << 1 << "QML StyledItem: Theme 'TestModule.TestTheme' has no 'TestStyle.qml' style for version 1.0, fall back to version 1.3.";
+                << "version1.3";
         QTest::newRow("App theme versioned")
                 << "StyledItemAppThemeVersioned.qml"
-                << "version1.3"
-                << 0 << 0 << "";
-        QTest::newRow("App theme fallback to non-versioned")
-                << "StyledItemAppThemeFallback.qml"
-                << ""
-                << 0 << 0 << "";
+                << "version1.3";
     }
     void test_theme_versions()
     {
         QFETCH(QString, document);
         QFETCH(QString, testValue);
-        QFETCH(int, row);
-        QFETCH(int, column);
-        QFETCH(QString, warning);
 
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
         qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
-        if (!warning.isEmpty()) {
-            ThemeTestCase::ignoreWarning(document, row, column, warning);
-        }
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document));
         UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(view->rootObject());
         QVERIFY(UCStyledItemBasePrivate::get(styledItem)->styleItem);
@@ -689,9 +666,6 @@
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
         qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule:" + m_themesPath.toLatin1());
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("DeprecatedTheme.qml"));
-        // NOTE TestTheme resets the theme therefore the theming will look for the tested style version under Ambiance theme
-        // which will cause a warning; therefore we mark the warning to be ignored
-        ThemeTestCase::ignoreWarning("DeprecatedTheme.qml", 19, 1, "QML StyledItem: Theme 'Ubuntu.Components.Themes.Ambiance' has no 'OptionSelectorStyle.qml' style for version 1.0, fall back to version 1.3.");
     }
 
     void test_style_change_has_precedence()