git.iko.soy/unity8
on xenial help sign in
better mock logging
commit38eaad10c3d12ae53c4828d02bf7a8f668ab2d01 authorNick Dedekind <nicholas.dedekind@gmail.com> dateFri 8 Aug 2014, 10:40 (12 years ago) parent8a36dc4
3 files changed+30−19
compare with xenial
unifiedsplit
tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp+3−4 tests/mocks/Unity/Application/ApplicationInfo.cpp+13−9 tests/mocks/Unity/Application/MirSurfaceItem.cpp+14−6
tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp+3−4
@@ -45,13 +45,15 @@ MirSurfaceItem* topSurface(MirSurfaceItem* surface)
4545
4646quint32 ApplicationDBusAdaptor::addPromptSurface(const QString &appId, const QString &surfaceImage)
4747{
48+ qDebug() << "ApplicationDBusAdaptor::addPromptSurface to " << appId;
49+
4850 ApplicationInfo* application = m_applicationManager->findApplication(appId);
4951 if (!application) {
5052 qDebug() << "ApplicationDBusAdaptor::addChildSurface - No application found for " << appId;
5153 return 0;
5254 }
5355 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),
5557 MirSurfaceItem::Normal,
5658 MirSurfaceItem::Maximized,
5759 QUrl(surfaceImage));
@@ -59,13 +61,10 @@ quint32 ApplicationDBusAdaptor::addPromptSurface(const QString &appId, const QSt
5961
6062 if (application->promptSurfaceList().count() > 0) {
6163 surface->setParentSurface(topSurface(application->promptSurfaceList()[0]));
62− qDebug() << "ApplicationDBusAdaptor::addChildSurface - " << appId;
6364 } else {
6465 application->addPromptSurface(surface);
65− qDebug() << "ApplicationDBusAdaptor::addPromptSurface - " << appId;
6666 }
6767
68−
6968 return surfaceId;
7069}
7170
tests/mocks/Unity/Application/ApplicationInfo.cpp+13−9
@@ -78,6 +78,7 @@ void ApplicationInfo::createSurface()
7878
7979void ApplicationInfo::setSurface(MirSurfaceItem* surface)
8080{
81+ qDebug() << "Application::setSurface - appId=" << appId() << "surface=" << surface;
8182 if (m_surface == surface)
8283 return;
8384
@@ -99,11 +100,23 @@ void ApplicationInfo::setSurface(MirSurfaceItem* surface)
99100 SurfaceManager::singleton()->registerSurface(m_surface);
100101}
101102
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+
102113void ApplicationInfo::removeSurface(MirSurfaceItem* surface)
103114{
104115 if (m_surface == surface) {
105116 setSurface(nullptr);
106117 } else if (m_promptSurfaces.contains(surface)) {
118+ qDebug() << "Application::removeSurface " << surface->name() << " from " << name();
119+
107120 m_promptSurfaces.removeAll(surface);
108121 surface->setApplication(nullptr);
109122
@@ -111,15 +124,6 @@ void ApplicationInfo::removeSurface(MirSurfaceItem* surface)
111124 }
112125}
113126
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−
123127QList<MirSurfaceItem*> ApplicationInfo::promptSurfaceList() const
124128{
125129 return m_promptSurfaces;
tests/mocks/Unity/Application/MirSurfaceItem.cpp+14−6
@@ -34,6 +34,8 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,
3434 , m_parentSurface(nullptr)
3535 , m_haveInputMethod(false)
3636{
37+ qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();
38+
3739 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
3840
3941 // The virtual keyboard (input method) has a big transparent area so that
@@ -46,6 +48,8 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,
4648
4749MirSurfaceItem::~MirSurfaceItem()
4850{
51+ qDebug() << "MirSurfaceItem::~MirSurfaceItem() " << name();
52+
4953 QList<MirSurfaceItem*> children(m_children);
5054 for (MirSurfaceItem* child : children) {
5155 child->setParentSurface(nullptr);
@@ -104,20 +108,24 @@ void MirSurfaceItem::setParentSurface(MirSurfaceItem* surface)
104108 Q_EMIT parentSurfaceChanged(surface);
105109}
106110
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+
107119void MirSurfaceItem::removeChildSurface(MirSurfaceItem* surface)
108120{
121+ qDebug() << "MirSurfaceItem::removeChildSurface " << surface->name() << " from " << name();
122+
109123 if (m_children.contains(surface)) {
110124 m_children.removeOne(surface);
111125 Q_EMIT childSurfacesChanged();
112126 }
113127}
114128
115−void MirSurfaceItem::addChildSurface(MirSurfaceItem* surface)
116−{
117− m_children.append(surface);
118− Q_EMIT childSurfacesChanged();
119−}
120−
121129QList<MirSurfaceItem*> MirSurfaceItem::childSurfaceList()
122130{
123131 return m_children;