Unity 8

Merge lp:~aacid/unity8/borderSourceRegression into lp:unity8

  1. borderSourceRegression
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-05-12
Status: Merged
Approved by: Andrea Cimitan on 2015-05-19
Approved revision: 1777
Merged at revision: 1816
Proposed branch: lp:~aacid/unity8/borderSourceRegression
Merge into: lp:unity8
Diff against target: 99 lines (+17/-0)
5 files modified
plugins/Dash/CardCreator.js (+2/-0)
tests/plugins/Dash/cardcreator/1.res (+2/-0)
tests/plugins/Dash/cardcreator/3.res (+2/-0)
tests/plugins/Dash/cardcreator/5.res (+2/-0)
tests/qmltests/Dash/tst_GenericScopeView.qml (+9/-0)
To merge this branch: bzr merge lp:~aacid/unity8/borderSourceRegression
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) 2015-05-12 Approve on 2015-05-19
PS Jenkins bot continuous-integration Needs Fixing on 2015-05-12
Review via email: mp+258883@code.launchpad.net

Commit Message

Fix regression introduced by the concierge change

borderSource was being assigned incorrectly, bubbled up the property with an alias to the parent item so that less code has to be changed

Description of the Change

How to test:
 run
    make tryGenericScopeView
 with and without the patch

 * Are there any related MPs required for this MP to build/function as expected?
No

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

 * Did you make sure that your branch does not contain spurious tags?
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

To post a comment you must log in.
lp:~aacid/unity8/borderSourceRegression updated on 2015-05-12
1777. By Albert Astals Cid on 2015-05-12

Add test for next time refactor doesn't break it

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1776
http://jenkins.qa.ubuntu.com/job/unity8-ci/5714/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/880
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2738
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2738/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20412

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5714/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1777
http://jenkins.qa.ubuntu.com/job/unity8-ci/5717/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/883
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/882
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/883
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2744
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2744/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20420

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5717/rebuild

review: Needs Fixing (continuous-integration)
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
AP
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/CardCreator.js'
2--- plugins/Dash/CardCreator.js 2015-04-28 08:45:15 +0000
3+++ plugins/Dash/CardCreator.js 2015-05-12 14:12:35 +0000
4@@ -70,6 +70,7 @@
5 property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\
6 visible: image.status == Image.Ready; \n\
7 readonly property alias image: artImage.image; \n\
8+ property alias borderSource: artShapeShape.borderSource; \n\
9 ShaderEffectSource { \n\
10 id: artShapeSource; \n\
11 sourceItem: artImage; \n\
12@@ -79,6 +80,7 @@
13 hideSource: doShapeItem; \n\
14 } \n\
15 Shape { \n\
16+ id: artShapeShape; \n\
17 image: artShapeSource; \n\
18 anchors.fill: parent; \n\
19 visible: doShapeItem; \n\
20
21=== modified file 'tests/plugins/Dash/cardcreator/1.res'
22--- tests/plugins/Dash/cardcreator/1.res 2015-04-28 08:45:15 +0000
23+++ tests/plugins/Dash/cardcreator/1.res 2015-05-12 14:12:35 +0000
24@@ -34,6 +34,7 @@
25 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
26 visible: image.status == Image.Ready;
27 readonly property alias image: artImage.image;
28+ property alias borderSource: artShapeShape.borderSource;
29 ShaderEffectSource {
30 id: artShapeSource;
31 sourceItem: artImage;
32@@ -43,6 +44,7 @@
33 hideSource: doShapeItem;
34 }
35 Shape {
36+ id: artShapeShape;
37 image: artShapeSource;
38 anchors.fill: parent;
39 visible: doShapeItem;
40
41=== modified file 'tests/plugins/Dash/cardcreator/3.res'
42--- tests/plugins/Dash/cardcreator/3.res 2015-04-28 08:45:15 +0000
43+++ tests/plugins/Dash/cardcreator/3.res 2015-05-12 14:12:35 +0000
44@@ -34,6 +34,7 @@
45 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
46 visible: image.status == Image.Ready;
47 readonly property alias image: artImage.image;
48+ property alias borderSource: artShapeShape.borderSource;
49 ShaderEffectSource {
50 id: artShapeSource;
51 sourceItem: artImage;
52@@ -43,6 +44,7 @@
53 hideSource: doShapeItem;
54 }
55 Shape {
56+ id: artShapeShape;
57 image: artShapeSource;
58 anchors.fill: parent;
59 visible: doShapeItem;
60
61=== modified file 'tests/plugins/Dash/cardcreator/5.res'
62--- tests/plugins/Dash/cardcreator/5.res 2015-04-28 08:45:15 +0000
63+++ tests/plugins/Dash/cardcreator/5.res 2015-05-12 14:12:35 +0000
64@@ -34,6 +34,7 @@
65 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
66 visible: image.status == Image.Ready;
67 readonly property alias image: artImage.image;
68+ property alias borderSource: artShapeShape.borderSource;
69 ShaderEffectSource {
70 id: artShapeSource;
71 sourceItem: artImage;
72@@ -43,6 +44,7 @@
73 hideSource: doShapeItem;
74 }
75 Shape {
76+ id: artShapeShape;
77 image: artShapeSource;
78 anchors.fill: parent;
79 visible: doShapeItem;
80
81=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
82--- tests/qmltests/Dash/tst_GenericScopeView.qml 2015-03-27 12:30:24 +0000
83+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2015-05-12 14:12:35 +0000
84@@ -638,6 +638,15 @@
85 compare(item0.template["non-interactive"], false);
86 compare(item0.enabled, true);
87 }
88+
89+ function test_carousel_borderSource() {
90+ var category = scrollToCategory("dashCategory1");
91+ var tile = findChild(category, "carouselDelegate0");
92+ tryCompareFunction(function() { return findChild(tile, "artShapeLoader") !== null; }, true);
93+ var artShapeLoader = findChild(tile, "artShapeLoader");
94+ var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
95+ compare(shape.borderSource, undefined);
96+ }
97 }
98 }
99 }

Subscribers

People subscribed via source and target branches