[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krdc/Applications/16.04] test: fix test plugin
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2016-04-16 13:42:06
Message-ID: E1arQUA-0003HH-7K () scm ! kde ! org
[Download RAW message or body]

Git commit df7984e23429640a71cbc3d1b4fcaa9f7c5a3bd1 by Urs Wolfer.
Committed on 16/04/2016 at 13:35.
Pushed by uwolfer into branch 'Applications/16.04'.

fix test plugin

- flow was wrong: signals got emitted before #start got called
- emit sigals after a short waiting period in order to simulate
  real world behavior a bit better

M  +20   -13   test/testview.cpp
M  +3    -0    test/testview.h

http://commits.kde.org/krdc/df7984e23429640a71cbc3d1b4fcaa9f7c5a3bd1

diff --git a/test/testview.cpp b/test/testview.cpp
index 486dc9a..10ddfcc 100644
--- a/test/testview.cpp
+++ b/test/testview.cpp
@@ -24,6 +24,7 @@
 #include "testview.h"
 
 #include <QEvent>
+#include <QTimer>
 
 TestView::TestView(QWidget *parent, const QUrl &url, KConfigGroup configGroup)
         : RemoteView(parent)
@@ -31,19 +32,6 @@ TestView::TestView(QWidget *parent, const QUrl &url, KConfigGroup configGroup)
     m_hostPreferences = new TestHostPreferences(configGroup, this);
 
     Q_UNUSED(url);
-
-    setAutoFillBackground(true);
-
-    QPalette pal = palette();
-    pal.setColor(QPalette::Dark, Qt::yellow);
-    setPalette(pal);
-
-    const QSize size = QSize(640, 480);
-    setStatus(Connected);
-    setFixedSize(size);
-    setFixedSize(size);
-    emit framebufferSizeChanged(size.width(), size.height());
-    emit connected();
 }
 
 TestView::~TestView()
@@ -66,6 +54,22 @@ bool TestView::eventFilter(QObject *obj, QEvent *event)
     return RemoteView::eventFilter(obj, event);
 }
 
+void TestView::asyncConnect()
+{
+    QPalette pal = palette();
+    pal.setColor(QPalette::Background, Qt::yellow);
+    setPalette(pal);
+    setAutoFillBackground(true);
+
+    const QSize size = QSize(640, 480);
+    setFixedSize(size);
+    resize(size);
+    setStatus(Connected);
+    emit framebufferSizeChanged(size.width(), size.height());
+    emit connected();
+    setFocus();
+}
+
 QSize TestView::framebufferSize()
 {
     return minimumSizeHint();
@@ -83,6 +87,9 @@ bool TestView::isQuitting()
 
 bool TestView::start()
 {
+    setStatus(Connecting);
+    // call it async in order to simulate real world behavior
+    QTimer::singleShot(1000, this, SLOT(asyncConnect()));
     return true;
 }
 
diff --git a/test/testview.h b/test/testview.h
index 6f9d609..b9672e1 100644
--- a/test/testview.h
+++ b/test/testview.h
@@ -55,6 +55,9 @@ protected:
 
 private:
     TestHostPreferences *m_hostPreferences;
+
+private Q_SLOTS:
+    void asyncConnect();
 };
 
 

[prev in list] [next in list] [prev in thread] [next in thread]