Unity 8

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

stabilize_test_all_widgets_height
Merge into trunk

Proposed by Albert Astals Cid on 2016-05-11

Status:	Merged
Approved by:	Andrea Cimitan on 2016-05-23
Approved revision:	2398
Merged at revision:	2448
Proposed branch:	lp:~aacid/unity8/stabilize_test_all_widgets_height
Merge into:	lp:unity8
Diff against target:	142 lines (+72/-4) 4 files modified tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml (+23/-4) tests/qmltests/utils/Unity/Test/tst_UnityTest.qml (+31/-0) tests/utils/modules/Unity/Test/testutil.cpp (+17/-0) tests/utils/modules/Unity/Test/testutil.h (+1/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/stabilize_test_all_widgets_height
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-06-05
Andrea Cimitan (community)		2016-05-11	Approve on 2016-05-23
Review via email: mp+294377@code.launchpad.net

Commit Message

Stabilize PreviewExpandableTest::test_all_widgets_height

Description of the Change

* 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?
Test is more stable

* 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

lp:~aacid/unity8/stabilize_test_all_widgets_height updated on 2016-05-11

2397. By Albert Astals Cid on 2016-05-11: lazyimage is an item, so use children
2398. By Albert Astals Cid on 2016-05-11: Add a test for waitForBehaviors

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-11:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-11:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-13:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-23:

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

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2016-05-23:

* Did you perform an exploratory manual test run of the code change and any related functionality?
* Did CI run pass? If not, please explain why.

green lights froom jenkins! code is fine

review: Approve

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

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/stabilize_test_all_widgets_height updated on 2016-06-02

2399. By Albert Astals Cid on 2016-06-02: Merge

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-03:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-05:

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

review: Approve (continuous-integration)

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:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-11-30 08:29:00 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2016-06-02 08:05:59 +0000
@@ -299,6 +299,20 @@
              compare (repeater.itemAt(3).expanded, false);
+         }
++        function waitForLazyImage(obj)
++        {
++            if (UT.Util.isInstanceOf(obj, "LazyImage")) {
++                tryCompareFunction(function() { return obj.state != "default" && obj.state != "loading"; }, true);
++                for (var i in obj.transitions) {
++                    tryCompare(obj.transitions[i], "running", false);
++                }
++            }
++
++            for (var i in obj.children) {
++                waitForLazyImage(obj.children[i]);
++            }
++        }
++
          function test_all_widgets_height() {
              previewExpandable.widgetData = allWidgetsData;
@@ -319,14 +333,19 @@
                  previewWidgetFactory.widgetType = allWidgetsModel.get(i).type;
                  previewWidgetFactory.active = true;
--                // Wait for the height ot settle by waiting four times the time of the
--                // longest of the height behaviour animations
--                wait(UbuntuAnimation.SnapDuration * 4);
++                waitForRendering(repeater.itemAt(i));
++                waitForRendering(previewWidgetFactory);
++
++                waitForLazyImage(previewWidgetFactory);
++                waitForLazyImage(repeater.itemAt(i));
++
++                UT.Util.waitForBehaviors(previewWidgetFactory);
++                UT.Util.waitForBehaviors(repeater.itemAt(i));
                  // Check the item inside the expandable has the same height
                  // as the one straight from the factory
                  verify(repeater.itemAt(i).height > 0);
--                tryCompare(repeater.itemAt(i), "height", previewWidgetFactory.height);
++                compare(repeater.itemAt(i).height, previewWidgetFactory.height);
+             }
              mouseClick(expandButton);
 === modified file 'tests/qmltests/utils/Unity/Test/tst_UnityTest.qml'
 --- tests/qmltests/utils/Unity/Test/tst_UnityTest.qml	2015-07-15 15:07:19 +0000
 +++ tests/qmltests/utils/Unity/Test/tst_UnityTest.qml	2016-06-02 08:05:59 +0000
@@ -30,6 +30,20 @@
          id: testObject
+     }
++    Item {
++        id: item
++        Behavior on height {
++            NumberAnimation {
++                duration: 500
++            }
++        }
++        Behavior on width {
++            NumberAnimation {
++                duration: 100
++            }
++        }
++    }
++
      function test_direct() {
          compare(Util.isInstanceOf(rect, "QQuickRectangle"), true, "rect should be an instance of QQuickRectangle");
          compare(Util.isInstanceOf(Util, "TestUtil"), true, "Util should be an instance of TestUtil");
@@ -52,4 +66,21 @@
      function test_undefined() {
          compare(Util.isInstanceOf(undefined, "QObject"), false, "passing undefined should fail");
+     }
++
++    function test_behavior_waiting() {
++        item.height = 100;
++        verify(item.height != 100);
++
++        item.width = 100;
++        verify(item.width != 100);
++
++        var date1 = new Date();
++        Util.waitForBehaviors(item);
++        var date2 = new Date();
++
++        compare(item.height, 100);
++        compare(item.width, 100);
++
++        verify(date2 - date1 >= 500);
++    }
+ }
 === modified file 'tests/utils/modules/Unity/Test/testutil.cpp'
 --- tests/utils/modules/Unity/Test/testutil.cpp	2015-12-17 14:43:57 +0000
 +++ tests/utils/modules/Unity/Test/testutil.cpp	2016-06-02 08:05:59 +0000
@@ -20,6 +20,8 @@
  #include <qpa/qwindowsysteminterface.h>
  #include <QtGui/QGuiApplication>
  #include <QQuickView>
++#include <private/qquickbehavior_p.h>
++#include <private/qquickanimation_p.h>
  // UbuntuGestures lib
  #include <TouchRegistry>
@@ -56,6 +58,21 @@
      return result;
+ }
++void
++TestUtil::waitForBehaviors(QObject *obj)
++{
++    if (!obj) return;
++
++    Q_FOREACH(auto c, obj->children()) {
++        if (auto *b = dynamic_cast<QQuickBehavior*>(c)) {
++            if (b->animation()) {
++                QTRY_COMPARE(b->animation()->isRunning(), false);
++            }
++        }
++        waitForBehaviors(c);
++    }
++}
++
  TouchEventSequenceWrapper *TestUtil::touchEvent(QQuickItem *item)
+ {
      ensureTargetWindow();
 === modified file 'tests/utils/modules/Unity/Test/testutil.h'
 --- tests/utils/modules/Unity/Test/testutil.h	2015-12-17 14:43:57 +0000
 +++ tests/utils/modules/Unity/Test/testutil.h	2016-06-02 08:05:59 +0000
@@ -33,6 +33,7 @@
      ~TestUtil();
      Q_INVOKABLE bool isInstanceOf(QObject*, QString);
++    Q_INVOKABLE void waitForBehaviors(QObject *obj);
      Q_INVOKABLE TouchEventSequenceWrapper *touchEvent(QQuickItem *item);
  private: