Remove commented test in testlib (alive)
The test was added as commented in 2012, before it was not even mentioned in the pro file. I guess it was never run. Change-Id: Ib787c7811ab4f7f32a99869167cde2e12dbe3156bb10
Jędrzej Nowacki
parent
3e6d42b65c
commit
e2fdd7a9cb
|
|
@ -1 +0,0 @@
|
|||
tst_alive
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
SOURCES += tst_alive.cpp
|
||||
QT = core testlib
|
||||
|
||||
mac:CONFIG -= app_bundle
|
||||
CONFIG -= debug_and_release_target
|
||||
|
||||
|
||||
TARGET = alive
|
||||
|
||||
include($$QT_SOURCE_TREE/src/testlib/selfcover.pri)
|
||||
|
|
@ -1,147 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
#include <qcoreapplication.h>
|
||||
#include <qcoreevent.h>
|
||||
#include <qthread.h>
|
||||
|
||||
class QTestAliveEvent: public QEvent
|
||||
{
|
||||
public:
|
||||
|
||||
enum { AliveEventType = QEvent::User + 422 };
|
||||
|
||||
explicit inline QTestAliveEvent(int aSequenceId)
|
||||
: QEvent(QEvent::Type(AliveEventType)), seqId(aSequenceId)
|
||||
{}
|
||||
inline int sequenceId() const { return seqId; }
|
||||
|
||||
private:
|
||||
int seqId;
|
||||
};
|
||||
|
||||
class QTestAlivePinger: public QObject
|
||||
{
|
||||
public:
|
||||
QTestAlivePinger(QObject *receiver, QObject *parent = 0);
|
||||
bool event(QEvent *e);
|
||||
|
||||
protected:
|
||||
void timerEvent(QTimerEvent *event);
|
||||
|
||||
private:
|
||||
QObject *rec;
|
||||
int timerId;
|
||||
int currentSequenceId;
|
||||
int lastSequenceId;
|
||||
};
|
||||
|
||||
QTestAlivePinger::QTestAlivePinger(QObject *receiver, QObject *parent)
|
||||
: QObject(parent), rec(receiver), currentSequenceId(0), lastSequenceId(0)
|
||||
{
|
||||
if (!rec)
|
||||
qFatal("Null receiver object passed to QTestAlivePinger::QTestAlivePinger()");
|
||||
timerId = startTimer(850);
|
||||
}
|
||||
|
||||
bool QTestAlivePinger::event(QEvent *event)
|
||||
{
|
||||
// pong received
|
||||
if (int(event->type()) == QTestAliveEvent::AliveEventType) {
|
||||
QTestAliveEvent *e = static_cast<QTestAliveEvent *>(event);
|
||||
//qDebug("PONG %d received", e->sequenceId());
|
||||
// if the events are not delivered in order, we don't care.
|
||||
if (e->sequenceId() > lastSequenceId)
|
||||
lastSequenceId = e->sequenceId();
|
||||
return true;
|
||||
}
|
||||
return QObject::event(event);
|
||||
}
|
||||
|
||||
void QTestAlivePinger::timerEvent(QTimerEvent *event)
|
||||
{
|
||||
if (event->timerId() != timerId)
|
||||
return;
|
||||
|
||||
if (lastSequenceId < currentSequenceId - 2) {
|
||||
qWarning("TEST LAGS %d PINGS behind!", currentSequenceId - lastSequenceId);
|
||||
}
|
||||
++currentSequenceId;
|
||||
//qDebug("PING %d", currentSequenceId);
|
||||
QCoreApplication::postEvent(rec, new QTestAliveEvent(currentSequenceId));
|
||||
}
|
||||
|
||||
class QTestAlive: public QThread
|
||||
{
|
||||
public:
|
||||
QTestAlive(QObject *parent = 0);
|
||||
~QTestAlive();
|
||||
void run();
|
||||
|
||||
bool event(QEvent *e);
|
||||
|
||||
private:
|
||||
QTestAlivePinger *pinger;
|
||||
};
|
||||
|
||||
QTestAlive::QTestAlive(QObject *parent)
|
||||
: QThread(parent), pinger(0)
|
||||
{
|
||||
}
|
||||
|
||||
QTestAlive::~QTestAlive()
|
||||
{
|
||||
quit();
|
||||
while (isRunning());
|
||||
}
|
||||
|
||||
bool QTestAlive::event(QEvent *e)
|
||||
{
|
||||
if (int(e->type()) == QTestAliveEvent::AliveEventType && pinger) {
|
||||
// ping received, send back the pong
|
||||
//qDebug("PONG %d", static_cast<QTestAliveEvent *>(e)->sequenceId());
|
||||
QCoreApplication::postEvent(pinger,
|
||||
new QTestAliveEvent(static_cast<QTestAliveEvent *>(e)->sequenceId()));
|
||||
return true;
|
||||
}
|
||||
return QThread::event(e);
|
||||
}
|
||||
|
||||
void QTestAlive::run()
|
||||
{
|
||||
if (!QCoreApplication::instance())
|
||||
qFatal("QTestAlive::run(): Cannot start QTestAlive without a QCoreApplication instance.");
|
||||
|
||||
QTestAlivePinger p(this);
|
||||
pinger = &p;
|
||||
exec();
|
||||
pinger = 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
#include <QWidget>
|
||||
|
||||
#include "qtestalive.cpp"
|
||||
|
||||
class tst_Alive: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private slots:
|
||||
void alive();
|
||||
void addMouseDClick() const;
|
||||
};
|
||||
|
||||
void tst_Alive::alive()
|
||||
{
|
||||
QTestAlive a;
|
||||
a.start();
|
||||
|
||||
sleep(5);
|
||||
QCoreApplication::processEvents();
|
||||
qDebug("CUT");
|
||||
sleep(5);
|
||||
}
|
||||
|
||||
void tst_Alive::addMouseDClick() const
|
||||
{
|
||||
class DClickListener : public QWidget
|
||||
{
|
||||
public:
|
||||
DClickListener() : isTested(false)
|
||||
{
|
||||
}
|
||||
|
||||
bool isTested;
|
||||
protected:
|
||||
virtual void mouseDoubleClickEvent(QMouseEvent * event)
|
||||
{
|
||||
isTested = true;
|
||||
QCOMPARE(event->type(), QEvent::MouseButtonDblClick);
|
||||
}
|
||||
};
|
||||
|
||||
DClickListener listener;
|
||||
|
||||
QTestEventList list;
|
||||
list.addMouseDClick(Qt::LeftButton);
|
||||
|
||||
list.simulate(&listener);
|
||||
/* Check that we have been called at all. */
|
||||
QVERIFY(listener.isTested);
|
||||
}
|
||||
|
||||
QTEST_MAIN(tst_Alive)
|
||||
#include "tst_alive.moc"
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
SUBPROGRAMS = \
|
||||
#alive \
|
||||
assert \
|
||||
badxml \
|
||||
benchlibcallgrind \
|
||||
|
|
|
|||
|
|
@ -439,7 +439,6 @@ void tst_Selftests::runSubTest_data()
|
|||
QTest::addColumn<bool>("crashes");
|
||||
|
||||
QStringList tests = QStringList()
|
||||
// << "alive" // timer dependent
|
||||
#if !defined(Q_OS_WIN)
|
||||
// On windows, assert does nothing in release mode and blocks execution
|
||||
// with a popup window in debug mode.
|
||||
|
|
|
|||
Loading…
Reference in New Issue