on xenial help sign in
Removing unneeded workaround
commiteb2d9324c2ab9602939bc9954a0a8684a2fce712 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateFri 24 Apr 2015, 12:23 (12 years ago) parentc4581db
1 file changed−15
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp−15
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp−15
@@ -32,8 +32,6 @@ class tst_FloatingFlickable: public GestureTest
3232public:
3333 tst_FloatingFlickable();
3434private Q_SLOTS:
35− void init(); // called right before each and every test function is executed
36−
3735 void tapGoesThrough();
3836 void flickChangesContentX();
3937 void flickChangesContentY();
@@ -44,19 +42,6 @@ tst_FloatingFlickable::tst_FloatingFlickable()
4442{
4543}
4644
47−void tst_FloatingFlickable::init()
48−{
49− GestureTest::init();
50−
51− // We shouldn't need the three lines below, but a compiz/unity7
52− // regression means we don't pass the test without them because
53− // the window doesn't have the proper size. Can be removed in the
54− // future if the regression is fixed and tests pass again
55− m_view->resize(m_view->rootObject()->width(), m_view->rootObject()->height());
56− QTRY_COMPARE(m_view->width(), (int)m_view->rootObject()->width());
57− QTRY_COMPARE(m_view->height(), (int)m_view->rootObject()->height());
58−}
59−
6045void tst_FloatingFlickable::tapGoesThrough()
6146{
6247 FloatingFlickable *floatingFlickable =