Merge lp:~cimi/unity8/cardCreatorCache_update-on-artShapeStyle into lp:unity8

[Andrea Cimitan]

Correctly refresh cardcreator cache on artshapestyle changes

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

[Albert Astals Cid (aacid)]

Looks and works good.

Let's see if we can get a test before approving

review: Approve

[lp:~cimi/unity8/cardCreatorCache_update-on-artShapeStyle]

2443. By Andrea Cimitan on 2016-06-02

add test!

2444. By Andrea Cimitan on 2016-06-02

different approach

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2444
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1368/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1830
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/916
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/916
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/916
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1856
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1795
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1795
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1795
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1786/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1786/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1786/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1786/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1786/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1786/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1786/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1786/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1786
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1786/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1368/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
Yes

review: Approve

=== modified file 'plugins/Dash/CardCreatorCache.qml'
--- plugins/Dash/CardCreatorCache.qml	2016-03-04 13:57:48 +0000
+++ plugins/Dash/CardCreatorCache.qml	2016-06-02 15:13:54 +0000
@@ -29,7 +29,7 @@
 
         var tString = JSON.stringify(template);
         var cString = JSON.stringify(components);
-        var allString = tString + cString + isCardTool;
+        var allString = tString + cString + isCardTool + artShapeStyle;
         var component = cache[allString];
         if (component === undefined) {
             component = CardCreator.createCardComponent(root, template, components, isCardTool, artShapeStyle, allString);

=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2016-05-09 08:34:38 +0000
+++ qml/Dash/CardTool.qml	2016-06-02 15:13:54 +0000
@@ -70,7 +70,7 @@
     // Not readonly because gets overwritten from GenericScopeView in some cases
     property string artShapeStyle: categoryLayout === "carousel" ? "shadow" : "inset"
 
-    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false, artShapeStyle);
+    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false, cardTool.artShapeStyle);
 
     // FIXME: Saviq
     // Only way for the card below to actually be laid out completely.
@@ -212,7 +212,7 @@
             "attributes": attributesModel.model,
             "socialActions": socialActionsModel.model
         }
-        sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true, artShapeStyle);
+        sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true, cardTool.artShapeStyle);
         onLoaded: {
             item.objectName = "cardToolCard";
             item.width = Qt.binding(function() { return cardTool.cardWidth !== -1 ? cardTool.cardWidth : item.implicitWidth; });

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2016-05-27 13:54:07 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2016-06-02 15:13:54 +0000
@@ -88,7 +88,7 @@
             return findChild(genericScopeView, categoryName);
         }
 
-        function clickCategoryDelegate(category, delegate) {
+        function getCategoryDelegate(category, delegate) {
             var dashContentList = findChild(dash, "dashContentList");
             var genericScopeView = dashContentList.currentItem;
             if (category === undefined) category = 0;
@@ -104,6 +104,11 @@
                                 true);
             var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
             waitForRendering(tile);
+            return tile;
+        }
+
+        function clickCategoryDelegate(category, delegate) {
+            var tile = getCategoryDelegate(category, delegate);
             mouseClick(tile);
         }
 
@@ -637,6 +642,18 @@
             tryCompare(dashContent, "x", 0);
         }
 
+        function test_cardIconStyle()
+        {
+            dash.setCurrentScope("clickscope");
+            var dashContent = findChild(dash, "dashContent");
+            tryCompare(dashContent.currentScope, "id", "clickscope");
+
+            scrollToCategory("dashCategorypredefined");
+            var tile = getCategoryDelegate("predefined", 2);
+            var proportionalShape = findChildsByType(tile, "UCProportionalShape");
+            compare(proportionalShape.length, 1);
+        }
+
         function test_tempScopeItemXOnResize()
         {
             // Go to a temp scope