git.iko.soy/unity8
on xenial help sign in
better mock logging
38eaad1Nick Dedekind
tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp+3−4
compare with xenial
unifiedsplit
@@ -45,13 +45,15 @@ MirSurfaceItem* topSurface(MirSurfaceItem* surface)
45
45
46quint32 ApplicationDBusAdaptor::addPromptSurface(const QString &appId, const QString &surfaceImage)
46quint32 ApplicationDBusAdaptor::addPromptSurface(const QString &appId, const QString &surfaceImage)
47{
47{
48+ qDebug() << "ApplicationDBusAdaptor::addPromptSurface to " << appId;
49+
48 ApplicationInfo* application = m_applicationManager->findApplication(appId);
50 ApplicationInfo* application = m_applicationManager->findApplication(appId);
49 if (!application) {
51 if (!application) {
50 qDebug() << "ApplicationDBusAdaptor::addChildSurface - No application found for " << appId;
52 qDebug() << "ApplicationDBusAdaptor::addChildSurface - No application found for " << appId;
51 return 0;
53 return 0;
52 }
54 }
53 quint32 surfaceId = ++nextId;
55 quint32 surfaceId = ++nextId;
54− MirSurfaceItem* surface = new MirSurfaceItem(QString("ChildSurface%1").arg(surfaceId),
56+ MirSurfaceItem* surface = new MirSurfaceItem(QString("%1-ChildSurface%2").arg(appId).arg(surfaceId),
55 MirSurfaceItem::Normal,
57 MirSurfaceItem::Normal,
56 MirSurfaceItem::Maximized,
58 MirSurfaceItem::Maximized,
57 QUrl(surfaceImage));
59 QUrl(surfaceImage));
@@ -59,13 +61,10 @@ quint32 ApplicationDBusAdaptor::addPromptSurface(const QString &appId, const QSt
59
61
60 if (application->promptSurfaceList().count() > 0) {
62 if (application->promptSurfaceList().count() > 0) {
61 surface->setParentSurface(topSurface(application->promptSurfaceList()[0]));
63 surface->setParentSurface(topSurface(application->promptSurfaceList()[0]));
62− qDebug() << "ApplicationDBusAdaptor::addChildSurface - " << appId;
63 } else {
64 } else {
64 application->addPromptSurface(surface);
65 application->addPromptSurface(surface);
65− qDebug() << "ApplicationDBusAdaptor::addPromptSurface - " << appId;
66 }
66 }
67
67
68−
69 return surfaceId;
68 return surfaceId;
70}
69}
71
70
tests/mocks/Unity/Application/ApplicationInfo.cpp+13−9
@@ -78,6 +78,7 @@ void ApplicationInfo::createSurface()
78
78
79void ApplicationInfo::setSurface(MirSurfaceItem* surface)
79void ApplicationInfo::setSurface(MirSurfaceItem* surface)
80{
80{
81+ qDebug() << "Application::setSurface - appId=" << appId() << "surface=" << surface;
81 if (m_surface == surface)
82 if (m_surface == surface)
82 return;
83 return;
83
84
@@ -99,11 +100,23 @@ void ApplicationInfo::setSurface(MirSurfaceItem* surface)
99 SurfaceManager::singleton()->registerSurface(m_surface);
100 SurfaceManager::singleton()->registerSurface(m_surface);
100}
101}
101
102
103+void ApplicationInfo::addPromptSurface(MirSurfaceItem* surface)
104+{
105+ qDebug() << "ApplicationInfo::addPromptSurface " << surface->name() << " to " << name();
106+ if (surface == m_surface || m_promptSurfaces.contains(surface)) return;
107+
108+ surface->setApplication(this);
109+ m_promptSurfaces.append(surface);
110+ Q_EMIT promptSurfacesChanged();
111+}
112+
102void ApplicationInfo::removeSurface(MirSurfaceItem* surface)
113void ApplicationInfo::removeSurface(MirSurfaceItem* surface)
103{
114{
104 if (m_surface == surface) {
115 if (m_surface == surface) {
105 setSurface(nullptr);
116 setSurface(nullptr);
106 } else if (m_promptSurfaces.contains(surface)) {
117 } else if (m_promptSurfaces.contains(surface)) {
118+ qDebug() << "Application::removeSurface " << surface->name() << " from " << name();
119+
107 m_promptSurfaces.removeAll(surface);
120 m_promptSurfaces.removeAll(surface);
108 surface->setApplication(nullptr);
121 surface->setApplication(nullptr);
109
122
@@ -111,15 +124,6 @@ void ApplicationInfo::removeSurface(MirSurfaceItem* surface)
111 }
124 }
112}
125}
113
126
114−void ApplicationInfo::addPromptSurface(MirSurfaceItem* surface)
115−{
116− if (surface == m_surface || m_promptSurfaces.contains(surface)) return;
117−
118− surface->setApplication(this);
119− m_promptSurfaces.append(surface);
120− Q_EMIT promptSurfacesChanged();
121−}
122−
123QList<MirSurfaceItem*> ApplicationInfo::promptSurfaceList() const
127QList<MirSurfaceItem*> ApplicationInfo::promptSurfaceList() const
124{
128{
125 return m_promptSurfaces;
129 return m_promptSurfaces;
tests/mocks/Unity/Application/MirSurfaceItem.cpp+14−6
@@ -34,6 +34,8 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,
34 , m_parentSurface(nullptr)
34 , m_parentSurface(nullptr)
35 , m_haveInputMethod(false)
35 , m_haveInputMethod(false)
36{
36{
37+ qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();
38+
37 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
39 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
38
40
39 // The virtual keyboard (input method) has a big transparent area so that
41 // The virtual keyboard (input method) has a big transparent area so that
@@ -46,6 +48,8 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,
46
48
47MirSurfaceItem::~MirSurfaceItem()
49MirSurfaceItem::~MirSurfaceItem()
48{
50{
51+ qDebug() << "MirSurfaceItem::~MirSurfaceItem() " << name();
52+
49 QList<MirSurfaceItem*> children(m_children);
53 QList<MirSurfaceItem*> children(m_children);
50 for (MirSurfaceItem* child : children) {
54 for (MirSurfaceItem* child : children) {
51 child->setParentSurface(nullptr);
55 child->setParentSurface(nullptr);
@@ -104,20 +108,24 @@ void MirSurfaceItem::setParentSurface(MirSurfaceItem* surface)
104 Q_EMIT parentSurfaceChanged(surface);
108 Q_EMIT parentSurfaceChanged(surface);
105}
109}
106
110
111+void MirSurfaceItem::addChildSurface(MirSurfaceItem* surface)
112+{
113+ qDebug() << "MirSurfaceItem::addChildSurface " << surface->name() << " to " << name();
114+
115+ m_children.append(surface);
116+ Q_EMIT childSurfacesChanged();
117+}
118+
107void MirSurfaceItem::removeChildSurface(MirSurfaceItem* surface)
119void MirSurfaceItem::removeChildSurface(MirSurfaceItem* surface)
108{
120{
121+ qDebug() << "MirSurfaceItem::removeChildSurface " << surface->name() << " from " << name();
122+
109 if (m_children.contains(surface)) {
123 if (m_children.contains(surface)) {
110 m_children.removeOne(surface);
124 m_children.removeOne(surface);
111 Q_EMIT childSurfacesChanged();
125 Q_EMIT childSurfacesChanged();
112 }
126 }
113}
127}
114
128
115−void MirSurfaceItem::addChildSurface(MirSurfaceItem* surface)
116−{
117− m_children.append(surface);
118− Q_EMIT childSurfacesChanged();
119−}
120−
121QList<MirSurfaceItem*> MirSurfaceItem::childSurfaceList()
129QList<MirSurfaceItem*> MirSurfaceItem::childSurfaceList()
122{
130{
123 return m_children;
131 return m_children;