eb2d932 · unity8 · git.iko.soy

on xenial help sign in

Removing unneeded workaround

eb2d932Daniel d'Andrada12 years ago

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp−15

@@ -32,8 +32,6 @@ class tst_FloatingFlickable: public GestureTest

32public:

33 tst_FloatingFlickable();

34private Q_SLOTS:

35− void init(); // called right before each and every test function is executed

36−

37 void tapGoesThrough();

35 void tapGoesThrough();

38 void flickChangesContentX();

36 void flickChangesContentX();

39 void flickChangesContentY();

37 void flickChangesContentY();

@@ -44,19 +42,6 @@ tst_FloatingFlickable::tst_FloatingFlickable()

44{

42{

45}

43}

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−

60void tst_FloatingFlickable::tapGoesThrough()

45void tst_FloatingFlickable::tapGoesThrough()

61{

46{

62 FloatingFlickable *floatingFlickable =

47 FloatingFlickable *floatingFlickable =