Merge lp:~tomas-tormo/unity8/bug_1378814 into lp:unity8

[Tomás Tormo]

Reload Infographics userdata when the day changes

Reload infographic notification when the device is unlocked

[Albert Astals Cid (aacid)]

Hi Tomás, thanks for your patch.

We can only accept patches for Unity8 if the person has signed the
Canonical contributor licence agreement http://www.ubuntu.com/legal/contributors

As far as I can see you have not so you should do it before we can continue reviewing your code.

Thanks for helping improve unity8 :)

review: Needs Information

[Tomás Tormo (tomas-tormo)]

Hi Albert!!

I'm signing it right, now, but is asking for a Project contact...what
should I put there?

Thanks!!

On 26/08/16 15:23, Albert Astals Cid wrote:
> Review: Needs Information
>
> Hi Tomás, thanks for your patch.
>
> We can only accept patches for Unity8 if the person has signed the
> Canonical contributor licence agreement http://www.ubuntu.com/legal/contributors
>
> As far as I can see you have not so you should do it before we can continue reviewing your code.
>
> Thanks for helping improve unity8 :)

[Tomás Tormo (tomas-tormo)]

Hi Albert!

I had a look to

    http://www.canonical.com/projects/directory

and saw that Kevin Gunn is the contact for the unity8 project, so I put
his name there :)

I already signed the contract! Thank you for giving me the opportunity
to contribute to this fantastic project!

Tomas

On 26/08/16 17:00, Tomás Tormo wrote:
> Hi Albert!!
>
> I'm signing it right, now, but is asking for a Project contact...what
> should I put there?
>
> Thanks!!
>
> On 26/08/16 15:23, Albert Astals Cid wrote:
>> Review: Needs Information
>>
>> Hi Tomás, thanks for your patch.
>>
>> We can only accept patches for Unity8 if the person has signed the
>> Canonical contributor licence agreement http://www.ubuntu.com/legal/contributors
>>
>> As far as I can see you have not so you should do it before we can continue reviewing your code.
>>
>> Thanks for helping improve unity8 :)
>

[lp:~tomas-tormo/unity8/bug_1378814]

2598. By Tomás Tormo on 2016-08-29

Add unit test for new day detection and set in infographics

[Tomás Tormo (tomas-tormo)]

New commit with the following changes:

* Added unit test to check that the current day retrieved from the InfographicModel is correctly set
* Modified test_set_username function data: Removed first row as currently the label is not being modified by the infographicModel when the username changes, remaining blank

[Albert Astals Cid (aacid)]

The fact that you needed to change test_set_username_data shows you've broken that functionality since the test passes without your code changes.

Also your new test is testing the currentDay is set correctly, but that's mostly an implementation detail, what you want to check is that the label has changed to the correct values, no?

review: Needs Fixing

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

FAILED: Continuous integration, rev:2598
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~tomas-tormo/unity8/bug_1378814/+merge/303874/+edit-commit-message

https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2057/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2703
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1487
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1487
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1487
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2731
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2604
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2604
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2604
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2597
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2597/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2597
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2597/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2597
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2597/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2597
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2597/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2597
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2597/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2597
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2597/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2597
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2597/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2597
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2597/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2597
   ...

review: Needs Fixing (continuous-integration)

[Tomás Tormo (tomas-tormo)]

Hi Albert

The test was failing in my computer... After some little research I saw
that was the problem... That's why I made that change.. I'll revert it but
I want to know why is that! :S

About the test_set_username_data, I wanted to make sure that the
dataChanged signal was being fired when a new day was detected.

For this, my idea was first to set the currentDay property and then call
the infographics object as it's being called now (I'm talking from the top
of my mind, I don't have the code with me now)

This should reload the label content from the next UserMetrics data source.
The problem is that no signal was being fired in the unit test (while it
was correctly fired when testing in the phone).

I also thought about mocking the UserMetrics object to make sure that the
nextUserData function was called, but finally I preferred to do a simple
test first, and then discuss with you about the mock possibility , since
the change can be pretty deep.

And now the worst part... I'll be out for a couple of weeks, so I won't be
able to change anything till the middle of September... So if this bug can
wait is perfect for me, if not, feel free to assign it to other person

Thank you very much for your help :)

El mar., 30 ago. 2016 12:31, Unity8 CI Bot <email address hidden>
escribió:

> Review: Needs Fixing continuous-integration
>
> FAILED: Continuous integration, rev:2598
> No commit message was specified in the merge proposal. Click on the
> following link and set the commit message (if you want a jenkins rebuild
> you need to trigger it yourself):
>
> https://code.launchpad.net/~tomas-tormo/unity8/bug_1378814/+merge/303874/+edit-commit-message
>
> https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2057/
> Executed test runs:
> SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2703
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1487
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1487
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1487
> SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2731
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2604
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2604
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2604
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2597
> deb:
> https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2597/artifact/output/*zip*/output.zip
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2597
> deb:
> https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2597/artifact/output/*zip*/output.zip
> SUCCESS:
> https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2597
>...

[Albert Astals Cid (aacid)]

UserMetrics is already mocked, see mocks/libusermetrics/UserMetrics.cpp

It may be that the mock has some shortcomings that need fixing.

[Tomás Tormo (tomas-tormo)]

Great then! I didn't see that since I only had a short time last night to
review the bug...

I'll have a look as soon as I'm back

Thank you very much :)

El mar., 30 ago. 2016 14:54, Albert Astals Cid <email address hidden>
escribió:

> UserMetrics is already mocked, see mocks/libusermetrics/UserMetrics.cpp
>
> It may be that the mock has some shortcomings that need fixing.
> --
> https://code.launchpad.net/~tomas-tormo/unity8/bug_1378814/+merge/303874
> You are the owner of lp:~tomas-tormo/unity8/bug_1378814.
>

[Albert Astals Cid (aacid)]

ping?

[Tomás Tormo (tomas-tormo)]

Pong! :)

Unfortunately the time out took longer than expected... I came back
yesterday and I'm settling down, so I expect to start again with the bugs
(this one and many more :)) this afternoon.

Thanks for the wait and sorry for the inconvenience... :S

Tomas

El vie., 30 sept. 2016 10:11, Albert Astals Cid <email address hidden>
escribió:

> ping?
> --
> https://code.launchpad.net/~tomas-tormo/unity8/bug_1378814/+merge/303874
> You are the owner of lp:~tomas-tormo/unity8/bug_1378814.
>

[lp:~tomas-tormo/unity8/bug_1378814]

2599. By Tomás Tormo on 2016-10-05

* debian/control:
  - Drop unity-scope-mediascanner2 to a Suggests rather than a Recommends,
    to ease our transition to main. It's already seeded directly in
    Touch, so this will only affect the Desktop variant of unity8.

2600. By Tomás Tormo on 2016-10-10

Reload infographics object before each test

[Tomás Tormo (tomas-tormo)]

I've pushed new changes to address what you told me. The branch has been updated to the last revision in order to make sure that the changes doesn't brake anything.

Please, have a look at them when you have time for this :)

Thank you very much

[Albert Astals Cid (aacid)]

The new test is a bit suboptimal, the only thing that the test checks is that the currentDay variable has the value you want, but that's not what we care about, what we care about is that the "Reload infographic notification when the device is unlocked", i.e. there should be something that triggers startShowAnimation and then you check stuff changed.

Do I make sense?

review: Needs Fixing

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

FAILED: Continuous integration, rev:2600
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~tomas-tormo/unity8/bug_1378814/+merge/303874/+edit-commit-message

https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2351/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3094
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1739
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1739
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1739
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3122
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2978/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2978/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2978/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2978/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2978/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2978/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2978/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2978/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2978
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2978/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tomas-tormo/unity8/bug_1378814]

2601. By Tomás Tormo on 2016-10-11

Reset UserMetrics and Infographic state for each test. Check that user data is correctly updated when the day changes

[Tomás Tormo (tomas-tormo)]

You are totally right.

I changed the implementation to check that the user data is correctly reloaded when the day changes. Moreover, I also modified the UserMetrics mock to add a function which resets its state. In this way, each test starts with a fresh environment.

Please, have a look when you have time :)

Thank you very much

[lp:~tomas-tormo/unity8/bug_1378814]

2602. By Tomás Tormo on 2016-10-11

Sync po/oc.po file with trunk

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

PASSED: Continuous integration, rev:2601
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2355/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3106
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1751
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1751
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1751
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3134
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2990/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2990/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2990/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2990/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2990/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2990/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2990/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2990/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2990
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2990/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Tomás Tormo (tomas-tormo)]

I've reverted the po/oc.po file, since I accidentally committed an outdated version which was breaking the build in CI...

Sorry for that :S

[Albert Astals Cid (aacid)]

Are you sure that this actually fixes the bug?

I don't see startShowAnimation being triggered either on "day has changed" or on "i'm going out of 'sleep' to show the greeter".

review: Needs Information

[lp:~tomas-tormo/unity8/bug_1378814]

2603. By Tomás Tormo on 2016-10-17

Reload Infographics userdata when the screen turns on in case the day changed

[Tomás Tormo (tomas-tormo)]

I've updated the source code to the last revision and now the changes does not solve the bug, since the currentDay variable is reset each time the user turns the screen off (the Greeter is reloaded)

I've changed the implementation to detect the turn screen on event. Each time this happens, a day change is detected, and in that case, the infographics userdata is reloaded.

Please, have a look when you have time :)

Thank you very much

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

FAILED: Continuous integration, rev:2603
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2411/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3164
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1803
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1803
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1803
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3192
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3048/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3048
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3048/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I need to ask around if we're supposed to show infographics data on the desktop too, because otherwise relying on the power button may not be the optimal solution since you may have your screen set to not go to sleep and we should still change the infographics value when the day changes.

[Albert Astals Cid (aacid)]

Yes, since we need to support the Greeter on the desktop too it's better if we don't use the Powerd status change and instead we use a LiveTimer {} object with frequency: LiveTimer.Hour

https://developer.ubuntu.com/api/apps/qml/sdk-15.04.3/Ubuntu.Components.LiveTimer/

review: Needs Fixing

[lp:~tomas-tormo/unity8/bug_1378814]

2604. By Tomás Tormo on 2016-10-25

Sync to trunk

2605. By Tomás Tormo on 2016-10-25

Use a LiveTimer instead of the screen state to detect a new day, so the solution is valid also for the desktop version

2606. By Tomás Tormo on 2016-10-25

Remove unnecessary imports

[Tomás Tormo (tomas-tormo)]

As you suggested, I changed the Powerd connection solution to the LiveTimer one. I also changed the test to reflect this change. Both base code and test have been tested locally.

Thank you :)

[Albert Astals Cid (aacid)]

The setDay function in the mock is not needed anymore, right?

review: Needs Fixing

[Tomás Tormo (tomas-tormo)]

Yes, certainly is not needed anymore, however, it allows the day to be injected to the mock from the testcase. This makes the mock's behavior more deterministic as it can be directly controlled from outside. Future test cases that depend on the day may benefit from it.

However, if you think that it shouldn't be there because it's not used right now, let me know and I'll remove it :)

[Albert Astals Cid (aacid)]

I'd prefer if we have the "minimal code" needed to fix the issue, so yes please remove it (sorry i pointed you in the wrong direction at first)

[lp:~tomas-tormo/unity8/bug_1378814]

2607. By Tomás Tormo on 2016-10-27

Remove unnecessary setDay function from the UserMetrics mock

[Tomás Tormo (tomas-tormo)]

No problem at all!

I'll removed the function and everything related with it. Tests are passing locally.

Let me know if you see anything else :)

Thank you

[Albert Astals Cid (aacid)]

Looks good, i maually triggered CI to see if everything is good also from that perspective.

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

FAILED: Continuous integration, rev:2607
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2454/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3226
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1850
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1850
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1850
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3254
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3108/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3108/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3108/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3108/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3108/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3108/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3108/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3108/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3108
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3108/artifact/output/*zip*/output.zip

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

review: Needs Fixing (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.
No, but it's unrelated Launcher failures.

review: Approve

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2016-09-07 17:13:38 +0000
+++ qml/Greeter/Infographics.qml	2016-10-27 09:20:50 +0000
@@ -25,6 +25,8 @@
 
     property int animDuration: 10
 
+    property int currentWeekDay
+
     QtObject {
         id: d
         objectName: "infographicPrivate"
@@ -56,6 +58,24 @@
         onDataDisappeared: startShowAnimation() // show "no data" label
     }
 
+    LiveTimer {
+        frequency: LiveTimer.Hour
+        onTrigger: handleTimerTrigger()
+    }
+
+    function handleTimerTrigger(){
+        var today = new Date().getDay()
+        if(infographic.currentWeekDay !== today){
+            infographic.currentWeekDay = today
+            reloadUserData();
+        }
+    }
+
+    function reloadUserData(){
+        d.useDotAnimation = false
+        infographic.model.nextDataSource()
+    }
+
     function startShowAnimation() {
         dotHideAnimTimer.stop()
         notification.hideAnim.stop()
@@ -81,7 +101,10 @@
 
     visible: model.username !== ""
 
-    Component.onCompleted: startShowAnimation()
+    Component.onCompleted: {
+        currentWeekDay = new Date().getDay()
+        startShowAnimation()
+    }
 
     Item {
         id: dataCircle
@@ -405,8 +428,7 @@
 
         onDoubleClicked: {
             if (!d.animating) {
-                d.useDotAnimation = false
-                infographic.model.nextDataSource()
+                reloadUserData()
             }
         }
     }

=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
--- tests/mocks/libusermetrics/UserMetrics.cpp	2016-05-26 13:15:35 +0000
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2016-10-27 09:20:50 +0000
@@ -88,12 +88,16 @@
     void setUsername(const QString &username);
 
 protected:
+    void findAndSetUsername(const QString &username);
+
     void nextFakeData();
 
     void generateFakeData();
 
     void loadFakeData();
 
+    void loadUserMetricsData();
+
     void finishSetFakeData();
 
 private:
@@ -131,7 +135,7 @@
 }
 
 UserMetricsDataPrivate::UserMetricsDataPrivate(UserMetricsData *parent) :
-        q_ptr(parent), m_firstColor(this), m_secondColor(this)
+        q_ptr(parent), m_label(""), m_firstColor(this), m_secondColor(this)
 {
     m_length = calculateLength();
 }
@@ -229,12 +233,8 @@
 {
 }
 
-void UserMetricsPrivate::setUsername(const QString &username)
+void UserMetricsPrivate::findAndSetUsername(const QString &username)
 {
-    if (m_username == username && m_newData) {
-        return;
-    }
-
     m_username = username;
 
     m_dataIndex = m_fakeData.constFind(m_username);
@@ -243,6 +243,16 @@
         m_dataIndex = m_fakeData.constFind("");
     }
 
+    m_newData = *m_dataIndex;
+}
+
+void UserMetricsPrivate::setUsername(const QString &username)
+{
+    if (m_username == username && m_newData) {
+        return;
+    }
+
+    findAndSetUsername(username);
     loadFakeData();
 
     q_ptr->usernameChanged(m_username);
@@ -332,7 +342,6 @@
 
 void UserMetricsPrivate::loadFakeData()
 {
-    m_newData = *m_dataIndex;
 
     bool oldLabelEmpty = m_label.isEmpty();
     bool newLabelEmpty = m_newData->label().isEmpty();
@@ -351,24 +360,28 @@
     // we emit no signal if the data has stayed empty
 }
 
-void UserMetricsPrivate::finishSetFakeData()
+void UserMetricsPrivate::loadUserMetricsData()
 {
-    bool oldLabelEmpty = m_label.isEmpty();
-    bool newLabelEmpty = m_newData->label().isEmpty();
-
     m_label = m_newData->label();
     m_firstColor = m_newData->firstColor();
     m_firstMonth.setVariantList(m_newData->firstMonth());
     m_secondColor = m_newData->secondColor();
     m_secondMonth.setVariantList(m_newData->secondMonth());
+    m_currentDay = m_newData->length();
+}
 
+void UserMetricsPrivate::finishSetFakeData()
+{
+    bool oldLabelEmpty = m_label.isEmpty();
+    bool newLabelEmpty = m_newData->label().isEmpty();
     bool currentDayChanged = m_currentDay != m_newData->length();
-    m_currentDay = m_newData->length();
+
+    loadUserMetricsData();
 
     q_ptr->labelChanged(m_label);
     if (currentDayChanged)
     {
-        q_ptr->currentDayChanged(m_currentDay);
+       q_ptr->currentDayChanged(m_currentDay);
     }
 
     if (oldLabelEmpty && !newLabelEmpty)
@@ -396,6 +409,7 @@
         }
     }
 
+    m_newData = *m_dataIndex;
     loadFakeData();
 }
 
@@ -464,6 +478,12 @@
     d_ptr->finishSetFakeData();
 }
 
+void UserMetrics::reset()
+{
+    d_ptr->findAndSetUsername("");
+    d_ptr->loadUserMetricsData();
+}
+
 /**
  * Factory methods
  */

=== modified file 'tests/mocks/libusermetrics/UserMetrics.h'
--- tests/mocks/libusermetrics/UserMetrics.h	2013-06-14 19:35:25 +0000
+++ tests/mocks/libusermetrics/UserMetrics.h	2016-10-27 09:20:50 +0000
@@ -61,6 +61,8 @@
 
     QAbstractItemModel *secondMonth() const;
 
+    Q_INVOKABLE void reset();
+
 Q_SIGNALS:
     void labelChanged(const QString &label);
 

=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
--- tests/qmltests/Greeter/tst_Infographics.qml	2015-11-06 19:43:38 +0000
+++ tests/qmltests/Greeter/tst_Infographics.qml	2016-10-27 09:20:50 +0000
@@ -38,15 +38,62 @@
     width: units.gu(120)
     height: units.gu(120)
 
+    Loader {
+        id: loader
+
+        active: false
+        anchors.fill: parent
+
+        property bool componentDestroyed: true
+        sourceComponent: Component {
+            Infographics {
+                id: infographic
+                width: loader.width
+                height: loader.height
+                model: infographicModel
+
+                Component.onDestruction: {
+                    loader.componentDestroyed = true
+                }
+            }
+        }
+    }
+
     UT.UnityTestCase {
         name: "Infographics"
         when: windowShown
 
-        property var dataCircle: findChild(infographic, "dataCircle")
-        property var dots: findChild(infographic, "dots")
-        property var label: findChild(infographic, "label")
-        property var presentCircles: findChild(infographic, "presentCircles")
-        property var pastCircles: findChild(infographic, "pastCircles")
+        property var dataCircle
+        property var dots
+        property var label
+        property var presentCircles
+        property var pastCircles
+        property var infographic
+
+        function reloadInfographic() {
+            loader.active = false;
+            tryCompare(loader, "status", Loader.Null);
+            tryCompare(loader, "item", null);
+            tryCompare(loader, "componentDestroyed", true);
+            loader.active = true;
+            tryCompare(loader, "status", Loader.Ready);
+            loader.componentDestroyed = false
+            infographic = loader.item
+        }
+
+        function reloadModel() {
+           infographicModel.reset()
+        }
+
+        function init() {
+            reloadModel()
+            reloadInfographic()
+            dataCircle = findChild(infographic, "dataCircle")
+            dots =  findChild(infographic, "dots")
+            label =  findChild(infographic, "label")
+            presentCircles =  findChild(infographic, "presentCircles")
+            pastCircles = findChild(infographic, "pastCircles")
+        }
 
         function test_dot_states_data() {
             return [
@@ -74,9 +121,10 @@
 
         function test_set_username_data() {
             return [
-                { username: "has-password", label: "<b>19</b> minutes talk time", visible: true },
-                { username: "two-factor", label: "", visible: true },
-                { username: "", label: "", visible: false },
+               { username: "has-password", label: "<b>19</b> minutes talk time", visible: true },
+               { username: "two-factor", label: "", visible: true },
+               { username: "", label: "", visible: false },
+
             ]
         }
 
@@ -85,13 +133,29 @@
             tryCompare(label, "text", data.label)
             compare(infographic.visible, data.visible);
         }
-    }
-
-    Infographics {
-        id: infographic
-
-        anchors.fill: parent
-        model: infographicModel
+
+        function test_update_userdata_when_new_day_data()
+        {
+            return [
+               { tag: "Same day", 	   currentDayOffset: 0, label: "<b>19</b> minutes talk time" },
+               { tag: "Different day", currentDayOffset: 1, label: "<b>33</b> messages today" },
+            ]
+        }
+
+        function test_update_userdata_when_new_day(data)
+        {
+            //Given
+            var today = new Date().getDay()
+            infographicModel.username = "single"
+            infographic.currentWeekDay = (today - data.currentDayOffset)
+
+            //When
+            infographic.handleTimerTrigger()
+
+            //Then
+            tryCompare(infographic, "currentWeekDay", today)
+            tryCompare(label, "text", data.label)
+        }
     }
 
     Dot { id: dot }