Merge lp:~aacid/qtmir/fix_qteventfeeder_test_leak into lp:qtmir

[Albert Astals Cid]

Fix memory leak in QtEventFeederTest

MockQtWindowSystem needs to delete the devices passed to registerTouchDevice as the real Qt class does

 * 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?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[lp:~aacid/qtmir/fix_qteventfeeder_test_leak]

501. By Albert Astals Cid on 2016-05-30

remove debug change

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-18 11:15:56 +0000
+++ CMakeLists.txt	2016-05-30 10:26:25 +0000
@@ -13,6 +13,13 @@
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+find_package (ECM 1.7.0 QUIET NO_MODULE)
+if (ECM_FOUND)
+    # Provides us with -DECM_ENABLE_SANITIZERS='X'
+    # Where X can be address, thread, memory, leak, undefined
+    include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
+endif()
+
 # add custom cmake modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 

=== modified file 'src/modules/Unity/Application/session.cpp'
--- src/modules/Unity/Application/session.cpp	2016-05-17 19:18:44 +0000
+++ src/modules/Unity/Application/session.cpp	2016-05-30 10:26:25 +0000
@@ -84,7 +84,7 @@
 
 Session::~Session()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::~Session() " << name();
+    qDebug() << "Session::~Session() " << name();
     stopPromptSessions();
 
     QList<SessionInterface*> children(m_children->list());

=== modified file 'tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h'
--- tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h	2016-01-07 11:37:55 +0000
+++ tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h	2016-05-30 10:26:25 +0000
@@ -28,7 +28,6 @@
     MOCK_METHOD1(getWindowForTouchPoint, QWindow*(const QPoint &point));
     MOCK_METHOD0(lastWindow, QWindow*());
     MOCK_METHOD0(focusedWindow, QWindow*());
-    MOCK_METHOD1(registerTouchDevice, void(QTouchDevice* device));
 
     // Wanted to use GMock, but MOCK_METHOD11 not implemented
     void handleExtendedKeyEvent(QWindow */*window*/, ulong /*timestamp*/, QEvent::Type /*type*/, int /*key*/,
@@ -43,6 +42,18 @@
             Qt::KeyboardModifiers mods));
     MOCK_METHOD4(handleMouseEvent, void(ulong timestamp, QPointF point, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers));
     MOCK_METHOD3(handleWheelEvent, void(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers mods));
+
+    ~MockQtWindowSystem()
+    {
+        qDeleteAll(m_devices);
+    }
+
+    void registerTouchDevice(QTouchDevice* device)
+    {
+        m_devices << device;
+    }
+
+    QVector<QTouchDevice*> m_devices;
 };
 
 namespace testing

=== modified file 'tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp'
--- tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2016-04-29 15:41:00 +0000
+++ tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2016-05-30 10:26:25 +0000
@@ -78,11 +78,11 @@
     mockWindowSystem = new MockQtWindowSystem;
     auto screens = QSharedPointer<ScreensModel>();
 
-    EXPECT_CALL(*mockWindowSystem, registerTouchDevice(_));
+    ASSERT_TRUE(mockWindowSystem->m_devices.count() == 0);
 
     qtEventFeeder = new QtEventFeeder(screens, mockWindowSystem);
 
-    ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
+    ASSERT_TRUE(mockWindowSystem->m_devices.count() == 1);
 
     int argc = 0;
     char **argv = nullptr;

=== modified file 'tests/mirserver/ScreensModel/screensmodel_test.cpp'
--- tests/mirserver/ScreensModel/screensmodel_test.cpp	2016-04-29 15:41:00 +0000
+++ tests/mirserver/ScreensModel/screensmodel_test.cpp	2016-05-30 10:26:25 +0000
@@ -64,6 +64,7 @@
 void ScreensModelTest::TearDown()
 {
     delete screensModel;
+    delete app;
 }
 
 TEST_F(ScreensModelTest, SingleScreenFound)

=== modified file 'tests/modules/SessionManager/session_test.cpp'
--- tests/modules/SessionManager/session_test.cpp	2016-05-17 19:18:44 +0000
+++ tests/modules/SessionManager/session_test.cpp	2016-05-30 10:26:25 +0000
@@ -65,6 +65,8 @@
 
     surface->drawFirstFrame();
     EXPECT_EQ(Session::Running, session->state());
+
+    delete surface;
 }
 
 TEST_F(SessionTests, AddChildSession)
@@ -223,6 +225,7 @@
         FakeMirSurface *surface = new FakeMirSurface;
         session->registerSurface(surface);
         surface->drawFirstFrame();
+        delete surface;
     }
     EXPECT_EQ(Session::Running, session->state());
 
@@ -254,6 +257,7 @@
         FakeMirSurface *surface = new FakeMirSurface;
         session->registerSurface(surface);
         surface->drawFirstFrame();
+        delete surface;
     }
     EXPECT_EQ(Session::Running, session->state());
 
@@ -299,6 +303,7 @@
         FakeMirSurface *surface = new FakeMirSurface;
         session->registerSurface(surface);
         surface->drawFirstFrame();
+        delete surface;
     }
     EXPECT_EQ(Session::Running, session->state());