Unity 8

Merge lp:~cimi/unity8/preview-sharing-string-and-array into lp:unity8

preview-sharing-string-and-array
Merge into trunk

Proposed by Andrea Cimitan on 2016-02-24

Status:

Merged

Approved by:

Albert Astals Cid on 2016-02-25

Approved revision:

2208

Merged at revision:

2262

Proposed branch:

lp:~cimi/unity8/preview-sharing-string-and-array

Merge into:

lp:unity8

Diff against target:

82 lines (+34/-10)

2 files modified

qml/Dash/Previews/PreviewSharing.qml (+17/-7)
tests/qmltests/Dash/Previews/tst_PreviewSharing.qml (+17/-3)

To merge this branch:

bzr merge lp:~cimi/unity8/preview-sharing-string-and-array

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-25
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-02-25
Albert Astals Cid (community)			Approve on 2016-02-25
Paweł Stołowski		2016-02-24	Approve on 2016-02-24
Review via email: mp+287008@code.launchpad.net

Commit Message

PreviewSharing widget now accepts both string and array of widgetData["share-data"]["uri"]

Description of the Change

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

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-24:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-24:

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

review: Needs Fixing (continuous-integration)

Paweł Stołowski (stolowski) wrote on 2016-02-24:

Looks good to me, thanks!

review: Approve

Albert Astals Cid (aacid) wrote on 2016-02-25:

verify(exportedItems[0].url.toString().search(shareDataString["uri"][i]) != -1);

is wrong

should be

verify(exportedItems[0].url.toString().search(shareDataString["uri"]) != -1);

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2016-02-25:

Also i think it would make more sense if you made the uris real uris, i.e. "file:///Text here" and then you remove the ".toString().search" and do a real comparison.

What do you think?

lp:~cimi/unity8/preview-sharing-string-and-array updated on 2016-02-25

2206. By Andrea Cimitan on 2016-02-25: Fix as review
2207. By Andrea Cimitan on 2016-02-25: Use uri
2208. By Andrea Cimitan on 2016-02-25: Use compare

Albert Astals Cid (aacid) wrote on 2016-02-25:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Not really, i could not find any scope that uses this but code looks good and the reporter of the bug (via email) says it works (or so i understood)

* Did CI run pass?
Yes

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-25:

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

review: Needs Fixing (continuous-integration)

Zhang Enwei (zhangew401) wrote on 2016-03-02:

I verified the behaviour by using http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6646/artifact/work/output/*zip*/output.zip and Douban scope.
https://code.launchpad.net/~hanloon-team/hanloon/douban
The link is shared to Message and Twitter. There is one bug in facebook that prevents this happening.
Thanks a lot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andrea Cimitan

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Dash/Previews/PreviewSharing.qml'
 --- qml/Dash/Previews/PreviewSharing.qml	2015-12-17 15:42:39 +0000
 +++ qml/Dash/Previews/PreviewSharing.qml	2016-02-25 12:05:25 +0000
@@ -44,6 +44,22 @@
+         }
+     }
++    function createExportedItems(url) {
++        var items = new Array();
++        if (typeof url === "string") {
++            var exportItem = exportItemComponent.createObject();
++            exportItem.url = url;
++            items.push(exportItem);
++        } else {
++            for (var i = 0; i < url.length; i++) {
++                var exportItem = exportItemComponent.createObject();
++                exportItem.url = url[i];
++                items.push(exportItem);
++            }
++        }
++        return items;
++    }
++
      Component {
          id: exportItemComponent
          ContentItem {
@@ -76,13 +92,7 @@
              onPeerSelected: {
                  var transfer = peer.request();
                  if (transfer.state === ContentTransfer.InProgress) {
--                    var items = new Array();
--                    for (var i = 0; i < url.length; i++) {
--                        var exportItem = exportItemComponent.createObject();
--                        exportItem.url = url[i];
--                        items.push(exportItem);
--                    }
--                    transfer.items = items;
++                    transfer.items = createExportedItems(url);
                      transfer.state = ContentTransfer.Charged;
+                 }
                  peerPicker.visible = false;
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewSharing.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewSharing.qml	2016-01-04 19:28:43 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewSharing.qml	2016-02-25 12:05:25 +0000
@@ -28,13 +28,18 @@
      property var shareData: {
          "uri": [
--                    "Text here",
--                    "text here 2",
--                    "text here 3"
++                    "file:///this/is/an/url",
++                    "file:///this/is/an/url/2",
++                    "file:///this/is/an/url/3"
                  ],
          "content-type": "text"
+     }
++    property var shareDataString: {
++        "uri": "file:///this/is/an/url",
++        "content-type": "text"
++    }
++
      PreviewSharing {
          id: previewSharing
          anchors { left: parent.left; bottom: parent.bottom; }
@@ -55,5 +60,14 @@
              mouseClick(previewSharing);
              compare(peerPicker.visible, true);
+         }
++
++        function test_createExportedItems() {
++            var exportedItems = previewSharing.createExportedItems(shareData["uri"]);
++            for (var i = 0; i < exportedItems.length; i++) {
++                compare(exportedItems[i].url, shareData["uri"][i]);
++            }
++            exportedItems = previewSharing.createExportedItems(shareDataString["uri"]);
++            compare(exportedItems[0].url, shareDataString["uri"]);
++        }
+     }
+ }