summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/keypadnavigation/main.cpp37
-rw-r--r--tests/manual/lance/widgets.h1
-rw-r--r--tests/manual/manual.pro1
-rw-r--r--tests/manual/qgraphicslayout/flicker/window.h2
-rw-r--r--tests/manual/qnetconmonitor/qnetconmonitor.pro4
-rw-r--r--tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp220
-rw-r--r--tests/manual/rhi/computeimage/computeimage.cpp2
-rw-r--r--tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp4
-rw-r--r--tests/manual/rhi/offscreen/offscreen.cpp2
9 files changed, 248 insertions, 25 deletions
diff --git a/tests/manual/keypadnavigation/main.cpp b/tests/manual/keypadnavigation/main.cpp
index 67986a9cc9..dad4376514 100644
--- a/tests/manual/keypadnavigation/main.cpp
+++ b/tests/manual/keypadnavigation/main.cpp
@@ -33,7 +33,6 @@
#include <QFontDialog>
#include <QInputDialog>
#include <QMessageBox>
-#include <QSignalMapper>
#include "ui_keypadnavigation.h"
class KeypadNavigation : public QMainWindow
@@ -48,7 +47,7 @@ public:
ui->setupUi(this);
const struct {
- QObject *action;
+ QAction *action;
QWidget *page;
} layoutMappings[] = {
{ui->m_actionLayoutVerticalSimple, ui->m_pageVerticalSimple},
@@ -58,15 +57,16 @@ public:
{ui->m_actionLayoutChaos, ui->m_pageChaos},
{ui->m_actionLayoutDialogs, ui->m_pageDialogs}
};
- for (int i = 0; i < int(sizeof layoutMappings / sizeof layoutMappings[0]); ++i) {
- connect(layoutMappings[i].action, SIGNAL(triggered()), &m_layoutSignalMapper, SLOT(map()));
- m_layoutSignalMapper.setMapping(layoutMappings[i].action, layoutMappings[i].page);
+ for (auto layoutMapping : layoutMappings) {
+ const auto page = layoutMapping.page;
+ connect(layoutMapping.action, &QAction::triggered, ui->m_stackWidget,
+ [this, page]()
+ { ui->m_stackWidget->setCurrentWidget(page); });
}
- connect(&m_layoutSignalMapper, SIGNAL(mapped(QWidget*)), ui->m_stackWidget, SLOT(setCurrentWidget(QWidget*)));
#ifdef QT_KEYPAD_NAVIGATION
const struct {
- QObject *action;
+ QAction *action;
Qt::NavigationMode mode;
} modeMappings[] = {
{ui->m_actionModeNone, Qt::NavigationModeNone},
@@ -75,17 +75,17 @@ public:
{ui->m_actionModeCursorAuto, Qt::NavigationModeCursorAuto},
{ui->m_actionModeCursorForceVisible, Qt::NavigationModeCursorForceVisible}
};
- for (int i = 0; i < int(sizeof modeMappings / sizeof modeMappings[0]); ++i) {
- connect(modeMappings[i].action, SIGNAL(triggered()), &m_modeSignalMapper, SLOT(map()));
- m_modeSignalMapper.setMapping(modeMappings[i].action, int(modeMappings[i].mode));
+ for (auto modeMapping : modeMappings) {
+ const auto mode = modeMapping.mode;
+ connect(modeMapping.action, &QAction::triggered, this,
+ [this, mode]() { setNavigationMode(mode); });
}
- connect(&m_modeSignalMapper, SIGNAL(mapped(int)), SLOT(setNavigationMode(int)));
#else // QT_KEYPAD_NAVIGATION
ui->m_menuNavigation_mode->deleteLater();
#endif // QT_KEYPAD_NAVIGATION
const struct {
- QObject *button;
+ QPushButton *button;
Dialog dialog;
} openDialogMappings[] = {
{ui->m_buttonGetOpenFileName, DialogGetOpenFileName},
@@ -97,11 +97,11 @@ public:
{ui->m_buttonAboutQt, DialogAboutQt},
{ui->m_buttonGetItem, DialogGetItem}
};
- for (int i = 0; i < int(sizeof openDialogMappings / sizeof openDialogMappings[0]); ++i) {
- connect(openDialogMappings[i].button, SIGNAL(clicked()), &m_dialogSignalMapper, SLOT(map()));
- m_dialogSignalMapper.setMapping(openDialogMappings[i].button, int(openDialogMappings[i].dialog));
+ for (auto openDialogMapping : openDialogMappings) {
+ const auto dialog = openDialogMapping.dialog;
+ connect(openDialogMapping.button, &QPushButton::clicked, this,
+ [this, dialog]() { openDialog(dialog); });
}
- connect(&m_dialogSignalMapper, SIGNAL(mapped(int)), SLOT(openDialog(int)));
}
~KeypadNavigation()
@@ -162,11 +162,6 @@ private:
};
Ui_KeypadNavigation *ui;
- QSignalMapper m_layoutSignalMapper;
-#ifdef QT_KEYPAD_NAVIGATION
- QSignalMapper m_modeSignalMapper;
-#endif // QT_KEYPAD_NAVIGATION
- QSignalMapper m_dialogSignalMapper;
};
int main(int argc, char *argv[])
diff --git a/tests/manual/lance/widgets.h b/tests/manual/lance/widgets.h
index 46c55f4c16..09b2c3e667 100644
--- a/tests/manual/lance/widgets.h
+++ b/tests/manual/lance/widgets.h
@@ -43,7 +43,6 @@
#include <QFileDialog>
#include <QTextStream>
#include <QPaintEngine>
-#include <QSignalMapper>
#include <QAction>
#include <QDebug>
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 63c8eb6538..e688546374 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -23,6 +23,7 @@ qimagereader \
qlayout \
qlocale \
qmimedatabase \
+qnetconmonitor \
qnetworkaccessmanager/qget \
qnetworkconfigurationmanager \
qnetworkconfiguration \
diff --git a/tests/manual/qgraphicslayout/flicker/window.h b/tests/manual/qgraphicslayout/flicker/window.h
index 22a53585d1..3e7bc61731 100644
--- a/tests/manual/qgraphicslayout/flicker/window.h
+++ b/tests/manual/qgraphicslayout/flicker/window.h
@@ -107,7 +107,7 @@ public:
Q_UNUSED(option);
Q_UNUSED(widget);
painter->setBrush(m_brush);
- painter->drawRoundRect(rect());
+ painter->drawRoundedRect(rect(), Qt::RelativeSize);
painter->drawLine(rect().topLeft(), rect().bottomRight());
painter->drawLine(rect().bottomLeft(), rect().topRight());
}
diff --git a/tests/manual/qnetconmonitor/qnetconmonitor.pro b/tests/manual/qnetconmonitor/qnetconmonitor.pro
new file mode 100644
index 0000000000..dda88c4cd7
--- /dev/null
+++ b/tests/manual/qnetconmonitor/qnetconmonitor.pro
@@ -0,0 +1,4 @@
+TEMPLATE = app
+QT = network-private testlib
+CONFIG += console
+SOURCES += tst_qnetconmonitor.cpp
diff --git a/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp b/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp
new file mode 100644
index 0000000000..92daee3348
--- /dev/null
+++ b/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp
@@ -0,0 +1,220 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 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 <QtCore/qcoreapplication.h>
+#include <QtCore/qdeadlinetimer.h>
+
+#include <QtNetwork/qhostinfo.h>
+#include <QtNetwork/private/qnetconmonitor_p.h>
+
+#include <QtTest/qsignalspy.h>
+
+void testDetectDisconnection();
+void testDetectRouteDisrupted();
+
+int main(int argc, char *argv[])
+{
+ QCoreApplication app(argc, argv);
+
+ if (!QNetworkStatusMonitor::isEnabled()) {
+ qWarning("QNetworkStatusMonitor is not enabled for this platform!");
+ return 0;
+ }
+
+ while (true) {
+
+ QByteArray indent(" ");
+ {
+ QTextStream writer(stdout);
+ writer << "Manual test for QNetwork{Status|Connection}Monitor\n"
+ << "The tests are grouped by what they test. Run them in any order\n"
+ << "- QNetworkStatusMonitor tests:\n"
+ << indent << "c" << indent << "Test connection and disconnection detection.\n"
+ << "- QNetworkConnectionMonitor tests:\n"
+ << indent << "r" << indent << "Test detection of disruption of route to target.\n"
+ << "- General\n"
+ << indent << "q" << indent << "Quit the test.\n"
+ << "> ";
+ }
+
+ auto getCommand = []() {
+ char ch;
+ QTextStream reader(stdin);
+ reader >> ch;
+ return ch;
+ };
+
+ switch (getCommand()) {
+ case 'c':
+ testDetectDisconnection();
+ break;
+ case 'r':
+ testDetectRouteDisrupted();
+ break;
+ case 'q':
+ return 0;
+ }
+ }
+ Q_UNREACHABLE();
+ return 0;
+}
+
+bool ensureNetworkAccessible(QNetworkStatusMonitor &status, QTextStream &writer)
+{
+ if (!status.isNetworkAccessible()) {
+ writer << "Network currently not accessible, please make sure you have an internet "
+ "connection. Will wait for a connection for 20 seconds.\n";
+ writer.flush();
+ QDeadlineTimer timer{ 20 * 1000 };
+ while (!timer.hasExpired() && !status.isNetworkAccessible())
+ QCoreApplication::processEvents();
+ if (!status.isNetworkAccessible()) {
+ writer << "Error: No network in 20 seconds, ending now!\n";
+ return false;
+ }
+ writer << "Network successfully connected, thanks!\n";
+ }
+ return true;
+}
+
+void testDetectDisconnection()
+{
+ QTextStream writer(stdout);
+ QNetworkStatusMonitor status;
+
+ if (!status.start()) {
+ writer << "Error: Failed to start";
+ return;
+ }
+
+ if (!ensureNetworkAccessible(status, writer))
+ return;
+
+ QSignalSpy onlineStateSpy(&status, &QNetworkStatusMonitor::onlineStateChanged);
+
+ writer << "Please disconnect from the internet within 20 seconds\n";
+ writer.flush();
+ QDeadlineTimer timer{ 20 * 1000 };
+ while (!timer.hasExpired() && status.isNetworkAccessible())
+ QCoreApplication::processEvents();
+ if (status.isNetworkAccessible()) {
+ writer << "Error: Still connected after 20 seconds, ending now!\n";
+ return;
+ }
+ if (onlineStateSpy.count() == 0) {
+ writer << "Error: There was a disconnection but there was no signal emitted!\n";
+ return;
+ }
+ // Get the final parameter of the final signal emission and make sure it is false.
+ if (onlineStateSpy.last().last().toBool()) {
+ writer << "Error: There was a disconnection but the latest signal emitted says we are online!\n";
+ return;
+ }
+ writer << "Success, connection loss was detected!\n";
+}
+
+void testDetectRouteDisrupted()
+{
+ QTextStream writer(stdout);
+
+ {
+ QNetworkStatusMonitor status;
+ if (!status.start()) {
+ writer << "Error: Failed to start";
+ return;
+ }
+ if (!ensureNetworkAccessible(status, writer))
+ return;
+ }
+
+ QNetworkConnectionMonitor connection;
+
+ auto readLineFromStdin = []() -> QString {
+ QTextStream in(stdin);
+ return in.readLine();
+ };
+
+ writer << "Type your local IP address: ";
+ writer.flush();
+ const QHostAddress local{ readLineFromStdin() };
+ if (local.isNull()) {
+ writer << "Error: The address is invalid!\n";
+ return;
+ }
+
+ const QHostAddress defaultAddress{ QString::fromLatin1("1.1.1.1") };
+ QHostAddress remote;
+ do {
+ writer << "Type a remote IP address [" << defaultAddress.toString() << "]: ";
+ writer.flush();
+ QString address = readLineFromStdin();
+ if (address.isEmpty()) {
+ remote = defaultAddress;
+ } else {
+ QHostAddress remoteTemp{ address };
+ if (remoteTemp.isNull()) {
+ writer << "Invalid address\n";
+ } else {
+ remote = remoteTemp;
+ }
+ }
+ } while (remote.isNull());
+
+ if (!connection.setTargets(local, remote)) {
+ writer << "Error: Failed to set the targets!\n";
+ return;
+ }
+ if (!connection.isReachable()) {
+ writer << "Error: Target is not reachable!\n";
+ return;
+ }
+ if (!connection.startMonitoring()) {
+ writer << "Error: Failed to start monitoring!\n";
+ return;
+ }
+
+ QSignalSpy reachabilitySpy(&connection, &QNetworkConnectionMonitor::reachabilityChanged);
+
+ writer << "QNetworkConnectionMonitor might assume the target is initially reachable.\n"
+ "If it is not reachable then this test might not work correctly.\n"
+ "Please disrupt the connection between your machine and the target within 20 "
+ "seconds\n";
+ writer.flush();
+ reachabilitySpy.wait(20 * 1000);
+ if (reachabilitySpy.count() == 0) {
+ writer << "Error: There was a disconnection but there was no signal emitted!\n";
+ return;
+ }
+ // Get the final parameter of the final signal emission and make sure it is false.
+ if (reachabilitySpy.last().last().toBool()) {
+ writer << "Error: There was a disconnection but the latest signal emitted says the target is "
+ "reachable!\n";
+ return;
+ }
+ writer << "Success, connection disruption was detected!\n";
+}
diff --git a/tests/manual/rhi/computeimage/computeimage.cpp b/tests/manual/rhi/computeimage/computeimage.cpp
index 7bc05fc04f..51bf216c5a 100644
--- a/tests/manual/rhi/computeimage/computeimage.cpp
+++ b/tests/manual/rhi/computeimage/computeimage.cpp
@@ -146,7 +146,7 @@ void Window::customInit()
d.ubuf->build();
d.releasePool << d.ubuf;
- qint32 flip = m_r->isYUpInFramebuffer() ? 1 : 0;
+ qint32 flip = 0; // regardless of isYUpInFramebuffer() since the input is not flipped so the end result is good for GL too
d.initialUpdates->updateDynamicBuffer(d.ubuf, 64, 4, &flip);
d.sampler = m_r->newSampler(QRhiSampler::Linear, QRhiSampler::Linear, QRhiSampler::None,
diff --git a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
index 8fda2b73c8..53185bddb2 100644
--- a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
+++ b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp
@@ -290,6 +290,10 @@ struct Renderer
void Thread::run()
{
while (active) {
+#ifdef Q_OS_DARWIN
+ QMacAutoReleasePool autoReleasePool;
+#endif
+
if (pendingRender) {
pendingRender = false;
renderer->render(pendingRenderIsNewExpose, false);
diff --git a/tests/manual/rhi/offscreen/offscreen.cpp b/tests/manual/rhi/offscreen/offscreen.cpp
index 678d6ffe48..79e50d3dd4 100644
--- a/tests/manual/rhi/offscreen/offscreen.cpp
+++ b/tests/manual/rhi/offscreen/offscreen.cpp
@@ -307,7 +307,7 @@ int main(int argc, char **argv)
opacity = qBound(0.0f, opacity, 1.0f);
}
- cb->beginPass(rt, { 0, 1, 0, 1 }, { 1, 0 }, u);
+ cb->beginPass(rt, QColor::fromRgbF(0.0f, 1.0f, 0.0f, 1.0f), { 1, 0 }, u);
cb->setGraphicsPipeline(ps);
cb->setViewport({ 0, 0, 1280, 720 });
cb->setShaderResources();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 14:53:35 +0000